L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -26,6 +26,8 @@ NasMm::NasMm(TaskBase *base, UeTimers *timers) : m_base{base}, m_timers{timers},
     m_cmState = ECmState::CM_IDLE;
     m_mmState = EMmState::MM_DEREGISTERED;
     m_mmSubState = EMmSubState::MM_DEREGISTERED_NA;
+
+    m_storage = new MmStorage(m_base);
 }
 
 void NasMm::onStart(NasSm *sm, Usim *usim)

src/ue/nas/mm/dereg.cpp

@@ -253,7 +253,7 @@ void NasMm::receiveDeregistrationRequest(const nas::DeRegistrationRequestUeTermi
             tai.plmn.isLongMnc = m_usim->m_currentTai->plmn.isLongMnc;
             tai.tac = (int)m_usim->m_currentTai->tac;
 
-            m_storage.m_forbiddenTaiListRoaming->add(tai);
+            m_storage->m_forbiddenTaiListRoaming->add(tai);
         }
 
         if (cause == nas::EMmCause::ILLEGAL_UE || cause == nas::EMmCause::FIVEG_SERVICES_NOT_ALLOWED)

src/ue/nas/mm/mm.hpp

@@ -31,7 +31,7 @@ class NasMm
     std::unique_ptr<Logger> m_logger;
     NasSm *m_sm;
     Usim *m_usim;
-    MmStorage m_storage;
+    MmStorage* m_storage;
 
     ERmState m_rmState;
     ECmState m_cmState;

src/ue/nas/mm/register.cpp

@@ -569,7 +569,7 @@ void NasMm::receiveInitialRegistrationReject(const nas::RegistrationReject &msg)
             tai.plmn.isLongMnc = m_usim->m_currentTai->plmn.isLongMnc;
             tai.tac = (int)m_usim->m_currentTai->tac;
 
-            m_storage.m_forbiddenTaiListRoaming->add(tai);
+            m_storage->m_forbiddenTaiListRoaming->add(tai);
         }
 
         if (cause == nas::EMmCause::PLMN_NOT_ALLOWED || cause == nas::EMmCause::SERVING_NETWORK_NOT_AUTHORIZED)
@@ -733,7 +733,7 @@ void NasMm::receiveMobilityRegistrationReject(const nas::RegistrationReject &msg
         tai.plmn.isLongMnc = m_usim->m_currentTai->plmn.isLongMnc;
         tai.tac = (int)m_usim->m_currentTai->tac;
 
-        m_storage.m_forbiddenTaiListRoaming->add(tai);
+        m_storage->m_forbiddenTaiListRoaming->add(tai);
     }
 
     if (cause == nas::EMmCause::PLMN_NOT_ALLOWED || cause == nas::EMmCause::SERVING_NETWORK_NOT_AUTHORIZED)

src/ue/nas/mm/service.cpp

@@ -316,7 +316,7 @@ void NasMm::receiveServiceReject(const nas::ServiceReject &msg)
         tai.plmn.isLongMnc = m_usim->m_currentTai->plmn.isLongMnc;
         tai.tac = (int)m_usim->m_currentTai->tac;
 
-        m_storage.m_forbiddenTaiListRps->add(tai);
+        m_storage->m_forbiddenTaiListRps->add(tai);
     }
 
     if (cause == nas::EMmCause::ROAMING_NOT_ALLOWED_IN_TA || cause == nas::EMmCause::NO_SUITIBLE_CELLS_IN_TA)
@@ -327,7 +327,7 @@ void NasMm::receiveServiceReject(const nas::ServiceReject &msg)
         tai.plmn.isLongMnc = m_usim->m_currentTai->plmn.isLongMnc;
         tai.tac = (int)m_usim->m_currentTai->tac;
 
-        m_storage.m_forbiddenTaiListRoaming->add(tai);
+        m_storage->m_forbiddenTaiListRoaming->add(tai);
 
         nas::utils::RemoveFromTaiList(m_usim->m_taiList, *m_usim->m_currentTai);
     }

src/ue/nas/storage.cpp

@@ -14,7 +14,7 @@ static constexpr const int64_t FORBIDDEN_TAI_CLEAR_PERIOD = 1000ll * 60ll * 60ll
 namespace nr::ue
 {
 
-MmStorage::MmStorage()
+MmStorage::MmStorage(TaskBase *base) : m_base{base}
 {
     m_forbiddenTaiListRoaming =
         std::make_unique<nas::NasListT1<Tai>>(FORBIDDEN_TAI_LIST_SIZE, FORBIDDEN_TAI_CLEAR_PERIOD, std::nullopt);

src/ue/nas/storage.hpp

@@ -8,18 +8,22 @@
 
 #include <lib/nas/msg.hpp>
 #include <lib/nas/storage.hpp>
+#include <ue/types.hpp>
 
 namespace nr::ue
 {
 
 class MmStorage
 {
+  private:
+    TaskBase *m_base;
+
   public:
     std::unique_ptr<nas::NasListT1<Tai>> m_forbiddenTaiListRoaming;
     std::unique_ptr<nas::NasListT1<Tai>> m_forbiddenTaiListRps;
 
   public:
-    MmStorage();
+    explicit MmStorage(TaskBase *base);
 };
 
 } // namespace nr::ue