Adopt existing ngap_ambr_t in NGAP PDU Session Setup Request
This commit is contained in:
@@ -664,11 +664,8 @@ typedef struct ngap_pdusession_setup_req_s {
|
|||||||
/* E RAB setup request */
|
/* E RAB setup request */
|
||||||
pdusession_t pdusession_setup_params[NGAP_MAX_PDU_SESSION];
|
pdusession_t pdusession_setup_params[NGAP_MAX_PDU_SESSION];
|
||||||
|
|
||||||
/* UE Uplink Aggregated Max Bitrates */
|
/* UE Aggregated Max Bitrates */
|
||||||
uint64_t ueAggMaxBitRateUplink;
|
ngap_ambr_t ueAggMaxBitRate;
|
||||||
|
|
||||||
/* UE Downlink Aggregated Max Bitrates */
|
|
||||||
uint64_t ueAggMaxBitRateDownlink;
|
|
||||||
|
|
||||||
} ngap_pdusession_setup_req_t;
|
} ngap_pdusession_setup_req_t;
|
||||||
|
|
||||||
|
|||||||
@@ -940,7 +940,7 @@ void rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(MessageDef *msg_p, instance_t ins
|
|||||||
return;
|
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
|
// 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);
|
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};
|
ngap_cause_t cause = {.type = NGAP_CAUSE_RADIO_NETWORK, .value = NGAP_CAUSE_RADIO_NETWORK_RESOURCES_NOT_AVAILABLE_FOR_THE_SLICE};
|
||||||
|
|||||||
@@ -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_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
|
||||||
NGAP_ProtocolIE_ID_id_UEAggregateMaximumBitRate, true);
|
NGAP_ProtocolIE_ID_id_UEAggregateMaximumBitRate, true);
|
||||||
asn_INTEGER2ulong(&(ie->value.choice.UEAggregateMaximumBitRate.uEAggregateMaximumBitRateUL),
|
asn_INTEGER2ulong(&(ie->value.choice.UEAggregateMaximumBitRate.uEAggregateMaximumBitRateUL),
|
||||||
&msg->ueAggMaxBitRateUplink);
|
&msg->ueAggMaxBitRate.br_ul);
|
||||||
asn_INTEGER2ulong(&(ie->value.choice.UEAggregateMaximumBitRate.uEAggregateMaximumBitRateDL),
|
asn_INTEGER2ulong(&(ie->value.choice.UEAggregateMaximumBitRate.uEAggregateMaximumBitRateDL),
|
||||||
&msg->ueAggMaxBitRateDownlink);
|
&msg->ueAggMaxBitRate.br_dl);
|
||||||
|
|
||||||
NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
|
NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
|
||||||
NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSUReq, true);
|
NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSUReq, true);
|
||||||
|
|||||||
Reference in New Issue
Block a user