L3 RRC/NAS developments

src/ue/rrc/connection.cpp

@@ -55,8 +55,6 @@ void UeRrcTask::startConnectionEstablishment(OctetString &&nasPdu)
         return;
     }
 
-    // TODO: if it's already in progress
-
     if (m_initialId.present == ASN_RRC_InitialUE_Identity_PR_NOTHING)
     {
         m_initialId.present = ASN_RRC_InitialUE_Identity_PR_randomValue;

src/ue/rrc/task.cpp

@@ -23,7 +23,7 @@ static constexpr const int TIMER_PERIOD_MACHINE_CYCLE = 2500;
 namespace nr::ue
 {
 
-UeRrcTask::UeRrcTask(TaskBase *base) : m_base{base}
+UeRrcTask::UeRrcTask(TaskBase *base) : m_base{base}, m_timers{}
 {
     m_logger = base->logBase->makeUniqueLogger(base->config->getLoggerPrefix() + "rrc");
 

src/ue/rrc/task.hpp

@@ -50,17 +50,22 @@ class UeRrcTask : public NtsTask
   private:
     TaskBase *m_base;
     std::unique_ptr<Logger> m_logger;
+
     int64_t m_startedTime;
     ERrcState m_state;
+    RrcTimers m_timers;
+
+    /* Cell and PLMN related */
     std::unordered_map<int, UeCellDesc> m_cellDesc{};
+    int64_t m_lastTimePlmnSearchFailureLogged{};
 
+    /* Procedure related */
     ERrcLastSetupRequest m_lastSetupReq{};
 
+    /* Establishment procedure related */
     ASN_RRC_InitialUE_Identity_t m_initialId{};
     OctetString m_initialNasPdu{};
 
-    int64_t m_lastTimePlmnSearchFailureLogged{};
-
     friend class UeCmdHandler;
 
   public:

src/ue/types.cpp

@@ -309,4 +309,8 @@ Tai UeSharedContext::getCurrentTai()
     return tai;
 }
 
+RrcTimers::RrcTimers() : t300(300, false, 1)
+{
+}
+
 } // namespace nr::ue

src/ue/types.hpp

@@ -188,6 +188,13 @@ struct TaskBase
     UeRlsTask *rlsTask{};
 };
 
+struct RrcTimers
+{
+    UeTimer t300;
+
+    RrcTimers();
+};
+
 struct NasTimers
 {
     UeTimer t3346; /* MM - ... */