From c643abd83e4922505b43df51244074f50c75e0ad Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 31 Jan 2024 16:20:00 +0100 Subject: [PATCH] DRB handling: handle E1AP default DRB logic properly --- openair2/E1AP/e1ap.c | 4 ++-- openair2/RRC/NR/rrc_gNB_NGAP.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openair2/E1AP/e1ap.c b/openair2/E1AP/e1ap.c index 79581698d9..64ded829ed 100644 --- a/openair2/E1AP/e1ap.c +++ b/openair2/E1AP/e1ap.c @@ -665,7 +665,7 @@ static int fill_BEARER_CONTEXT_SETUP_REQUEST(e1ap_bearer_setup_req_t *const bear asn1cSequenceAdd(ieC6_1->dRB_To_Setup_List_NG_RAN.list, E1AP_DRB_To_Setup_Item_NG_RAN_t, ieC6_1_1); ieC6_1_1->dRB_ID = j->id; - ieC6_1_1->sDAP_Configuration.defaultDRB = j->defaultDRB; + ieC6_1_1->sDAP_Configuration.defaultDRB = j->defaultDRB ? E1AP_DefaultDRB_true : E1AP_DefaultDRB_false; ieC6_1_1->sDAP_Configuration.sDAP_Header_UL = j->sDAP_Header_UL; ieC6_1_1->sDAP_Configuration.sDAP_Header_DL = j->sDAP_Header_DL; @@ -971,7 +971,7 @@ void extract_BEARER_CONTEXT_SETUP_REQUEST(const E1AP_E1AP_PDU_t *pdu, e1ap_beare drb->id = drb2Setup->dRB_ID; - drb->defaultDRB = drb2Setup->sDAP_Configuration.defaultDRB; + drb->defaultDRB = drb2Setup->sDAP_Configuration.defaultDRB == E1AP_DefaultDRB_true; drb->sDAP_Header_UL = drb2Setup->sDAP_Configuration.sDAP_Header_UL; drb->sDAP_Header_DL = drb2Setup->sDAP_Configuration.sDAP_Header_DL; diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c index e3e83610f2..b74a9a759c 100644 --- a/openair2/RRC/NR/rrc_gNB_NGAP.c +++ b/openair2/RRC/NR/rrc_gNB_NGAP.c @@ -413,7 +413,7 @@ static void trigger_bearer_setup(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE, int n, pdu drb->id = rrc_drb->drb_id; struct sdap_config_s *sdap_config = &rrc_drb->cnAssociation.sdap_config; - drb->defaultDRB = sdap_config->defaultDRB ? E1AP_DefaultDRB_true : E1AP_DefaultDRB_false; + drb->defaultDRB = sdap_config->defaultDRB; drb->sDAP_Header_UL = sdap_config->sdap_HeaderUL; drb->sDAP_Header_DL = sdap_config->sdap_HeaderDL;