L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -54,7 +54,7 @@ static EMmState GetMmStateFromSubState(EMmSubState subState)
     std::terminate();
 }
 
-NasMm::NasMm(TaskBase *base, UeTimers *timers) : m_base{base}, m_timers{timers}, m_sm{}, m_usim{}
+NasMm::NasMm(TaskBase *base, NasTimers *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

@@ -27,7 +27,7 @@ class NasMm
 {
   private:
     TaskBase *m_base;
-    UeTimers *m_timers;
+    NasTimers *m_timers;
     std::unique_ptr<Logger> m_logger;
     NasSm *m_sm;
     Usim *m_usim;
@@ -70,7 +70,7 @@ class NasMm
     friend class UeCmdHandler;
 
   public:
-    NasMm(TaskBase *base, UeTimers *timers);
+    NasMm(TaskBase *base, NasTimers *timers);
 
   public: /* Base */
     void onStart(NasSm *sm, Usim *usim);

src/ue/nas/sm/base.cpp

@@ -11,7 +11,7 @@
 namespace nr::ue
 {
 
-NasSm::NasSm(TaskBase *base, UeTimers *timers) : m_base(base), m_timers(timers), m_mm(nullptr)
+NasSm::NasSm(TaskBase *base, NasTimers *timers) : m_base(base), m_timers(timers), m_mm(nullptr)
 {
     m_logger = base->logBase->makeUniqueLogger(base->config->getLoggerPrefix() + "nas");
 

src/ue/nas/sm/sm.hpp

@@ -25,7 +25,7 @@ class NasSm
 {
   private:
     TaskBase *m_base;
-    UeTimers *m_timers;
+    NasTimers *m_timers;
     std::unique_ptr<Logger> m_logger;
     NasMm *m_mm;
 
@@ -35,7 +35,7 @@ class NasSm
     friend class UeCmdHandler;
 
   public:
-    NasSm(TaskBase *base, UeTimers *timers);
+    NasSm(TaskBase *base, NasTimers *timers);
 
   public:
     /* Base */

src/ue/nas/task.hpp

@@ -27,7 +27,7 @@ class NasTask : public NtsTask
     TaskBase *base;
     std::unique_ptr<Logger> logger;
 
-    UeTimers timers;
+    NasTimers timers;
     NasMm *mm;
     NasSm *sm;
     Usim *usim;

src/ue/types.cpp

@@ -12,7 +12,7 @@
 namespace nr::ue
 {
 
-UeTimers::UeTimers()
+NasTimers::NasTimers()
     : t3346(3346, true, INT32_MAX), t3396(3396, false, INT32_MAX), t3444(3444, true, 12 * 60 * 60),
       t3445(3445, true, 12 * 60 * 60), t3502(3502, true, 12 * 60), t3510(3510, true, 15), t3511(3511, true, 10),
       t3512(3512, true, 54 * 60), t3516(3516, true, 30), t3517(3517, true, 15), t3519(3519, true, 60),
@@ -144,7 +144,7 @@ Json ToJson(const UeConfig &v)
     });
 }
 
-Json ToJson(const UeTimers &v)
+Json ToJson(const NasTimers &v)
 {
     return Json::Obj({
         {"T3346", ToJson(v.t3346)},

src/ue/types.hpp

@@ -187,7 +187,7 @@ struct TaskBase
     UeRlsTask *rlsTask{};
 };
 
-struct UeTimers
+struct NasTimers
 {
     nas::NasTimer t3346; /* MM - ... */
     nas::NasTimer t3396; /* SM - ... */
@@ -210,7 +210,7 @@ struct UeTimers
     nas::NasTimer t3584; /* SM - ... */
     nas::NasTimer t3585; /* SM - ... */
 
-    UeTimers();
+    NasTimers();
 };
 
 enum class ERmState
@@ -545,7 +545,7 @@ Json ToJson(const EMmState &state);
 Json ToJson(const EMmSubState &state);
 Json ToJson(const E5UState &state);
 Json ToJson(const UeConfig &v);
-Json ToJson(const UeTimers &v);
+Json ToJson(const NasTimers &v);
 Json ToJson(const ERegUpdateCause &v);
 Json ToJson(const EPsState &v);
 Json ToJson(const UePduSessionInfo &v);