Commit 8764fb14 authored by yangjian's avatar yangjian

fix paging bug

parent 8f83c097
...@@ -2702,6 +2702,7 @@ void amf_n1::ul_nas_transport_handle(uint32_t ran_ue_ngap_id, ...@@ -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->snssai.sD = std::to_string(snssai.sd);
itti_msg->plmn.mnc = plmn.mnc; itti_msg->plmn.mnc = plmn.mnc;
itti_msg->plmn.mcc = plmn.mcc; 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> i =
std::shared_ptr<itti_smf_services_consumer>(itti_msg); std::shared_ptr<itti_smf_services_consumer>(itti_msg);
int ret = itti_inst->send_msg(i); int ret = itti_inst->send_msg(i);
......
...@@ -241,9 +241,10 @@ void amf_n2::handle_itti_message(itti_paging& itti_msg) { ...@@ -241,9 +241,10 @@ void amf_n2::handle_itti_message(itti_paging& itti_msg) {
Logger::amf_n2().warn("=========================================="); Logger::amf_n2().warn("==========================================");
std :: vector < struct Tai_s > list; std :: vector < struct Tai_s > list;
Tai_t tai_test; Tai_t tai_test;
tai_test.mcc = itti_msg.plmn.mcc; tai_test.mcc = unc.get()->tai.mcc;
tai_test.mnc = itti_msg.plmn.mnc; tai_test.mnc = unc.get()->tai.mnc;
tai_test.tac = itti_msg.plmn.tac; tai_test.tac = unc.get()->tai.tac;
list.push_back(tai_test); list.push_back(tai_test);
Paging_test.setTAIListForPaging(list); Paging_test.setTAIListForPaging(list);
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include "gNB_context.hpp" #include "gNB_context.hpp"
using namespace sctp; using namespace sctp;
using namespace ngap;
typedef enum { typedef enum {
NGAP_UE_INVALID_STATE, NGAP_UE_INVALID_STATE,
NGAP_UE_WAITING_CSR, // Context Setup Response(CSR) NGAP_UE_WAITING_CSR, // Context Setup Response(CSR)
...@@ -60,6 +62,8 @@ class ue_ngap_context { ...@@ -60,6 +62,8 @@ class ue_ngap_context {
std :: string s_pointer = "1"; std :: string s_pointer = "1";
std :: string s_tmsi = "1"; std :: string s_tmsi = "1";
Tai_t tai;
// state management, ue status over the air // state management, ue status over the air
ng_ue_state_t ng_ue_state; ng_ue_state_t ng_ue_state;
}; };
......
...@@ -69,7 +69,6 @@ class itti_test_signalling_paging : public itti_msg_amf_app { ...@@ -69,7 +69,6 @@ class itti_test_signalling_paging : public itti_msg_amf_app {
public: public:
uint32_t ran_ue_ngap_id; uint32_t ran_ue_ngap_id;
long amf_ue_ngap_id; long amf_ue_ngap_id;
plmn_t plmn;
}; };
class itti_test_signalling_network_initiated_deregistration : public itti_msg_amf_app { class itti_test_signalling_network_initiated_deregistration : public itti_msg_amf_app {
......
...@@ -181,7 +181,6 @@ class itti_paging : public itti_msg_n2 { ...@@ -181,7 +181,6 @@ class itti_paging : public itti_msg_n2 {
public: public:
uint32_t ran_ue_ngap_id; uint32_t ran_ue_ngap_id;
long amf_ue_ngap_id; long amf_ue_ngap_id;
plmn_t plmn;
}; };
......
...@@ -76,7 +76,6 @@ void TestSignallingApiImpl::test_signalling_paging( ...@@ -76,7 +76,6 @@ void TestSignallingApiImpl::test_signalling_paging(
itti_msg->ran_ue_ngap_id = psc.get()->ran_ue_ngap_id; 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->amf_ue_ngap_id = psc.get()->amf_ue_ngap_id;
itti_msg->plmn = psc.get()->plmn;
std::shared_ptr<itti_test_signalling_paging> i = std::shared_ptr<itti_test_signalling_paging> i =
std::shared_ptr<itti_test_signalling_paging>(itti_msg); std::shared_ptr<itti_test_signalling_paging>(itti_msg);
......
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