fix paging bug

src/amf-app/amf_n1.cpp

@@ -2702,6 +2702,7 @@ void amf_n1::ul_nas_transport_handle(uint32_t ran_ue_ngap_id,
     itti_msg->snssai.sD = std::to_string(snssai.sd);
     itti_msg->plmn.mnc = plmn.mnc;
     itti_msg->plmn.mcc = plmn.mcc;
+    itti_msg->plmn.tac = plmn.tac;
     std::shared_ptr<itti_smf_services_consumer> i =
         std::shared_ptr<itti_smf_services_consumer>(itti_msg);
     int ret = itti_inst->send_msg(i);

src/amf-app/amf_n2.cpp

@@ -241,9 +241,10 @@ void amf_n2::handle_itti_message(itti_paging& itti_msg) {
   Logger::amf_n2().warn("==========================================");
   std :: vector < struct Tai_s > list;
   Tai_t tai_test;
-  tai_test.mcc = itti_msg.plmn.mcc;
-  tai_test.mnc = itti_msg.plmn.mnc;
-  tai_test.tac = itti_msg.plmn.tac;
+  tai_test.mcc = unc.get()->tai.mcc;
+  tai_test.mnc = unc.get()->tai.mnc;
+  tai_test.tac = unc.get()->tai.tac;
+
   list.push_back(tai_test);
   Paging_test.setTAIListForPaging(list);
 

src/contexts/ue_ngap_context.hpp

@@ -35,6 +35,8 @@
 #include "gNB_context.hpp"
 
 using namespace sctp;
+using namespace ngap;
+
 typedef enum {
   NGAP_UE_INVALID_STATE,
   NGAP_UE_WAITING_CSR,  // Context Setup Response(CSR)
@@ -60,6 +62,8 @@ class ue_ngap_context {
   std :: string s_pointer = "1";
   std :: string s_tmsi = "1";
 
+  Tai_t tai;
+
   // state management, ue status over the air
   ng_ue_state_t ng_ue_state;
 };

src/itti/msgs/itti_msg_amf_app.hpp

@@ -69,7 +69,6 @@ class itti_test_signalling_paging : public itti_msg_amf_app {
  public:
   uint32_t ran_ue_ngap_id;
   long amf_ue_ngap_id;
-  plmn_t plmn;
 };
 
 class itti_test_signalling_network_initiated_deregistration : public itti_msg_amf_app {

src/itti/msgs/itti_msg_n2.hpp

@@ -181,7 +181,6 @@ class itti_paging : public itti_msg_n2 {
  public:
   uint32_t ran_ue_ngap_id;
   long amf_ue_ngap_id;
-  plmn_t plmn;
 };
 
 

src/sbi/amf_server/impl/TestSignallingApiImpl.cpp

@@ -75,8 +75,7 @@ void TestSignallingApiImpl::test_signalling_paging(
         new itti_test_signalling_paging(AMF_SERVER, TASK_AMF_APP);
 
     itti_msg->ran_ue_ngap_id = psc.get()->ran_ue_ngap_id;
-    itti_msg->amf_ue_ngap_id = psc.get()->amf_ue_ngap_id;
-    itti_msg->plmn = psc.get()->plmn;
+    itti_msg->amf_ue_ngap_id = psc.get()->amf_ue_ngap_id;
 
     std::shared_ptr<itti_test_signalling_paging> i =
         std::shared_ptr<itti_test_signalling_paging>(itti_msg);