Commit ecb13e33 authored by Raphael Defosseux's avatar Raphael Defosseux

Merge branch 'fix_Ran_Ue_Ngap_Id' into 'develop'

fix for Ran UE Ngap ID

See merge request oai/cn5g/oai-cn5g-amf!66
parents 0e26b1eb 43eeb1a2
...@@ -584,7 +584,7 @@ void amf_n2::handle_itti_message(itti_initial_ue_message& init_ue_msg) { ...@@ -584,7 +584,7 @@ void amf_n2::handle_itti_message(itti_initial_ue_message& init_ue_msg) {
// UE NGAP Context // UE NGAP Context
uint32_t ran_ue_ngap_id = 0; uint32_t ran_ue_ngap_id = 0;
if ((ran_ue_ngap_id = init_ue_msg.initUeMsg->getRanUENgapID()) == 0) { if (!init_ue_msg.initUeMsg->getRanUENgapID(ran_ue_ngap_id)) {
Logger::amf_n2().error("Missing Mandatory IE (RanUeNgapId)"); Logger::amf_n2().error("Missing Mandatory IE (RanUeNgapId)");
return; return;
} }
......
...@@ -389,11 +389,12 @@ bool InitialUEMessageMsg::decodefrompdu(Ngap_NGAP_PDU_t* ngap_msg_pdu) { ...@@ -389,11 +389,12 @@ bool InitialUEMessageMsg::decodefrompdu(Ngap_NGAP_PDU_t* ngap_msg_pdu) {
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
uint32_t InitialUEMessageMsg::getRanUENgapID() { bool InitialUEMessageMsg::getRanUENgapID(uint32_t& value) {
if (ranUeNgapId) { if (ranUeNgapId) {
return ranUeNgapId->getRanUeNgapId(); value = ranUeNgapId->getRanUeNgapId();
return true;
} else { } else {
return 0; return false;
} }
} }
......
...@@ -61,7 +61,7 @@ class InitialUEMessageMsg { ...@@ -61,7 +61,7 @@ class InitialUEMessageMsg {
int encode2buffer(uint8_t* buf, int buf_size); int encode2buffer(uint8_t* buf, int buf_size);
// Decapsulation // Decapsulation
bool decodefrompdu(Ngap_NGAP_PDU_t* ngap_msg_pdu); bool decodefrompdu(Ngap_NGAP_PDU_t* ngap_msg_pdu);
uint32_t getRanUENgapID(); bool getRanUENgapID(uint32_t& value);
bool getNasPdu(uint8_t*& nas, size_t& sizeofnas); bool getNasPdu(uint8_t*& nas, size_t& sizeofnas);
bool getUserLocationInfoNR(struct NrCgi_s& cig, struct Tai_s& tai); bool getUserLocationInfoNR(struct NrCgi_s& cig, struct Tai_s& tai);
int getRRCEstablishmentCause(); int getRRCEstablishmentCause();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment