L3 RRC/NAS developments

src/lib/nas/storage.hpp

@@ -33,7 +33,7 @@ class NasListT1
   public:
     NasListT1(size_t sizeLimit, int64_t autoClearingPeriod)
         : m_sizeLimit{sizeLimit}, m_autoClearingPeriod{autoClearingPeriod}, m_data{sizeLimit}, m_size{},
-          m_lastAutoCleared{utils::CurrentTimeMillis()}
+          m_lastAutoCleared{::utils::CurrentTimeMillis()}
     {
     }
 
@@ -113,7 +113,7 @@ class NasListT1
   private:
     void autoClearIfNecessary()
     {
-        int64_t currentTime = utils::CurrentTimeMillis();
+        int64_t currentTime = ::utils::CurrentTimeMillis();
         if (currentTime - m_lastAutoCleared >= m_autoClearingPeriod)
         {
             m_lastAutoCleared = currentTime;

src/ue/nas/mm/base.cpp

@@ -18,7 +18,7 @@
 namespace nr::ue
 {
 
-NasMm::NasMm(TaskBase *base, UeTimers *timers) : m_base{base}, m_timers{timers}, m_sm{nullptr}
+NasMm::NasMm(TaskBase *base, UeTimers *timers) : m_base{base}, m_timers{timers}, m_sm{}, m_usim{}
 {
     m_logger = base->logBase->makeUniqueLogger(base->config->getLoggerPrefix() + "nas");
 

src/ue/nas/mm/mm.hpp

@@ -11,6 +11,7 @@
 #include <lib/crypt/milenage.hpp>
 #include <lib/nas/nas.hpp>
 #include <lib/nas/timer.hpp>
+#include <ue/nas/storage.hpp>
 #include <ue/nas/usim/usim.hpp>
 #include <ue/nts.hpp>
 #include <ue/types.hpp>
@@ -29,7 +30,8 @@ class NasMm
     UeTimers *m_timers;
     std::unique_ptr<Logger> m_logger;
     NasSm *m_sm;
-    Usim *m_usim{};
+    Usim *m_usim;
+    MmStorage m_storage;
 
     ERmState m_rmState;
     ECmState m_cmState;