From fa5c4d3a4cf9befdbf9ea324d0483c66a80a5b98 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 30 Oct 2023 08:37:13 +0100 Subject: [PATCH] Fix SDAP: correct ID, set default - Set the correct QoS flow ID to associate a correct QoS flow to the bearer: the UE would misassociate otherwise - Set the DRB as the default: the handler applies bool with true==1, so use bool value --- openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c | 4 ++-- openair2/RRC/NR/rrc_gNB_NGAP.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c b/openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c index d661f9c6f4..7e00b0ee8d 100644 --- a/openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c +++ b/openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c @@ -53,8 +53,8 @@ static void fill_DRB_configList_e1(NR_DRB_ToAddModList_t *DRB_configList, const asn1cCalloc(sdap_config->mappedQoS_FlowsToAdd, FlowsToAdd); for (int j=0; j < drb->numQosFlow2Setup; j++) { - asn1cSequenceAdd(FlowsToAdd->list, NR_QFI_t, qfi); - *qfi = drb->qosFlows[j].fiveQI; + asn1cSequenceAdd(FlowsToAdd->list, NR_QFI_t, id); + *id = drb->qosFlows[j].id; } sdap_config->mappedQoS_FlowsToRelease = NULL; diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c index 1e1b9529b3..49d3ccad99 100644 --- a/openair2/RRC/NR/rrc_gNB_NGAP.c +++ b/openair2/RRC/NR/rrc_gNB_NGAP.c @@ -799,7 +799,7 @@ void rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(MessageDef *msg_p, instance_t ins drb->id = i + j + UE->nb_of_pdusessions; - drb->defaultDRB = E1AP_DefaultDRB_true; + drb->defaultDRB = true; drb->sDAP_Header_UL = !(rrc->configuration.enable_sdap); drb->sDAP_Header_DL = !(rrc->configuration.enable_sdap);