L3 RRC/NAS developments

src/ue/nas/mm/register.cpp

@@ -374,7 +374,7 @@ void NasMm::receiveInitialRegistrationAccept(const nas::RegistrationAccept &msg)
     if (regType == nas::ERegistrationType::INITIAL_REGISTRATION ||
         regType == nas::ERegistrationType::EMERGENCY_REGISTRATION)
     {
-        m_base->nasTask->push(new NmUeNasToNas(NmUeNasToNas::ESTABLISH_INITIAL_SESSIONS));
+        m_sm->establishInitialSessions();
     }
 
     if (regType == nas::ERegistrationType::INITIAL_REGISTRATION)

src/ue/nas/sm/base.cpp

@@ -29,18 +29,4 @@ void NasSm::onQuit()
     // TODO
 }
 
-void NasSm::establishInitialSessions()
-{
-    if (m_base->config->initSessions.empty())
-    {
-        m_logger->warn("No initial PDU sessions are configured");
-        return;
-    }
-
-    m_logger->debug("Initial PDU sessions are establishing [%d#]", m_base->config->initSessions.size());
-
-    for (auto &sess : m_base->config->initSessions)
-        sendEstablishmentRequest(sess);
-}
-
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/sm/resource.cpp

@@ -106,4 +106,18 @@ std::bitset<16> NasSm::getPduSessionStatus()
     return res;
 }
 
+void NasSm::establishInitialSessions()
+{
+    if (m_base->config->initSessions.empty())
+    {
+        m_logger->warn("No initial PDU sessions are configured");
+        return;
+    }
+
+    m_logger->debug("Initial PDU sessions are establishing [%d#]", m_base->config->initSessions.size());
+
+    for (auto &sess : m_base->config->initSessions)
+        sendEstablishmentRequest(sess);
+}
+
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/sm/sm.hpp

@@ -51,6 +51,7 @@ class NasSm
     bool anyEmergencyUplinkDataPending();
     std::bitset<16> getUplinkDataStatus();
     std::bitset<16> getPduSessionStatus();
+    void establishInitialSessions();
 
   private: /* Transport */
     void receiveSmMessage(const nas::SmMessage &msg);
@@ -67,7 +68,6 @@ class NasSm
     void freePduSessionId(int psi);
 
   private: /* Session Establishment */
-    void establishInitialSessions();
     void sendEstablishmentRequest(const SessionConfig &config);
     void receiveEstablishmentAccept(const nas::PduSessionEstablishmentAccept &msg);
     void receiveEstablishmentReject(const nas::PduSessionEstablishmentReject &msg);

src/ue/nas/task.cpp

@@ -75,10 +75,6 @@ void NasTask::onLoop()
                 sm->handleNasEvent(*w);
             break;
         }
-        case NmUeNasToNas::ESTABLISH_INITIAL_SESSIONS: {
-            sm->establishInitialSessions();
-            break;
-        }
         default:
             break;
         }

src/ue/nts.hpp

@@ -172,7 +172,6 @@ struct NmUeNasToNas : NtsMessage
     {
         PERFORM_MM_CYCLE,
         NAS_TIMER_EXPIRE,
-        ESTABLISH_INITIAL_SESSIONS
     } present;
 
     // NAS_TIMER_EXPIRE