Supported new behavior (coveying...

Supported new behavior (coveying RegistrationAccept/PDUSessionEstablishmentAccept in DownlinkNasTransport/InitialContextSetupRequest)

src/amf-app/amf_n2.cpp

@@ -529,14 +529,12 @@ void amf_n2::handle_itti_message(itti_initial_ue_message& init_ue_msg) {
       itti_msg->rrc_cause = init_ue_msg.initUeMsg->getRRCEstablishmentCause();
     }
 
-#if 0
-    if(init_ue_msg.initUeMsg->getUeContextRequest() == -1){
+    if (init_ue_msg.initUeMsg->getUeContextRequest() == -1) {
       Logger::amf_n2().warn("IE UeContextRequest not present");
-      itti_msg->ueCtxReq = -1;//not present
-    }else{
+      itti_msg->ueCtxReq = -1;  // not present
+    } else {
       itti_msg->ueCtxReq = init_ue_msg.initUeMsg->getUeContextRequest();
     }
-#endif
 
     std::string _5g_s_tmsi;
     if (!init_ue_msg.initUeMsg->get5GS_TMSI(_5g_s_tmsi)) {

src/ngap/ngapIEs/UEContextRequest.cpp

@@ -49,7 +49,6 @@ void UEContextRequest::setUEContextRequest(
 
 //------------------------------------------------------------------------------
 int UEContextRequest::getUEContextRequest() {
-  cout << "testing 11.2" << endl;
   return uecontextrequest;
 }
 

src/ngap/ngapMsgs/InitialUEMessage.cpp

@@ -385,7 +385,11 @@ bool InitialUEMessageMsg::decodefrompdu(Ngap_NGAP_PDU_t* ngap_msg_pdu) {
 
 //------------------------------------------------------------------------------
 uint32_t InitialUEMessageMsg::getRanUENgapID() {
-  return ranUeNgapId->getRanUeNgapId();
+  if (ranUeNgapId) {
+    return ranUeNgapId->getRanUeNgapId();
+  } else {
+    return 0;
+  }
 }
 
 //------------------------------------------------------------------------------
@@ -425,13 +429,20 @@ bool InitialUEMessageMsg::getUserLocationInfoNR(
 
 //------------------------------------------------------------------------------
 int InitialUEMessageMsg::getRRCEstablishmentCause() {
-  return rRCEstablishmentCause->getRRCEstablishmentCause();
+  if (rRCEstablishmentCause) {
+    return rRCEstablishmentCause->getRRCEstablishmentCause();
+  } else {
+    return -1;
+  }
 }
 
 //------------------------------------------------------------------------------
 int InitialUEMessageMsg::getUeContextRequest() {
-  cout << "testing 11.1" << endl;
-  return uEContextRequest->getUEContextRequest();
+  if (uEContextRequest) {
+    return uEContextRequest->getUEContextRequest();
+  } else {
+    return -1;
+  }
 }
 
 //------------------------------------------------------------------------------