From 4b2cd156bb6557d9fe7c8becc34a227d138c9ad1 Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Tue, 1 Apr 2025 15:42:36 +0200 Subject: [PATCH] Adopt existing ngap_ambr_t in NGAP PDU Session Setup Request --- openair2/COMMON/ngap_messages_types.h | 7 ++----- openair2/RRC/NR/rrc_gNB_NGAP.c | 2 +- openair3/NGAP/ngap_gNB_handlers.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h index 52cd919338..b899bb33e2 100644 --- a/openair2/COMMON/ngap_messages_types.h +++ b/openair2/COMMON/ngap_messages_types.h @@ -664,11 +664,8 @@ typedef struct ngap_pdusession_setup_req_s { /* E RAB setup request */ pdusession_t pdusession_setup_params[NGAP_MAX_PDU_SESSION]; - /* UE Uplink Aggregated Max Bitrates */ - uint64_t ueAggMaxBitRateUplink; - - /* UE Downlink Aggregated Max Bitrates */ - uint64_t ueAggMaxBitRateDownlink; + /* UE Aggregated Max Bitrates */ + ngap_ambr_t ueAggMaxBitRate; } ngap_pdusession_setup_req_t; diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c index 82aa7b5a86..1ff31acae1 100644 --- a/openair2/RRC/NR/rrc_gNB_NGAP.c +++ b/openair2/RRC/NR/rrc_gNB_NGAP.c @@ -940,7 +940,7 @@ void rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(MessageDef *msg_p, instance_t ins return; } - if (!trigger_bearer_setup(rrc, UE, msg->nb_pdusessions_tosetup, msg->pdusession_setup_params, msg->ueAggMaxBitRateDownlink)) { + if (!trigger_bearer_setup(rrc, UE, msg->nb_pdusessions_tosetup, msg->pdusession_setup_params, msg->ueAggMaxBitRate.br_dl)) { // Reject PDU Session Resource setup if there's no CU-UP associated LOG_W(NR_RRC, "UE %d: reject PDU Session Setup in PDU Session Resource Setup Response\n", UE->rrc_ue_id); ngap_cause_t cause = {.type = NGAP_CAUSE_RADIO_NETWORK, .value = NGAP_CAUSE_RADIO_NETWORK_RESOURCES_NOT_AVAILABLE_FOR_THE_SLICE}; diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c index ad8efce5a3..efa717e719 100644 --- a/openair3/NGAP/ngap_gNB_handlers.c +++ b/openair3/NGAP/ngap_gNB_handlers.c @@ -985,9 +985,9 @@ static int ngap_gNB_handle_pdusession_setup_request(sctp_assoc_t assoc_id, uint3 NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_UEAggregateMaximumBitRate, true); asn_INTEGER2ulong(&(ie->value.choice.UEAggregateMaximumBitRate.uEAggregateMaximumBitRateUL), - &msg->ueAggMaxBitRateUplink); + &msg->ueAggMaxBitRate.br_ul); asn_INTEGER2ulong(&(ie->value.choice.UEAggregateMaximumBitRate.uEAggregateMaximumBitRateDL), - &msg->ueAggMaxBitRateDownlink); + &msg->ueAggMaxBitRate.br_dl); NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSUReq, true);