L3 RRC/NAS developments

src/ue/nas/mm/register.cpp

@@ -371,18 +371,18 @@ void NasMm::receiveInitialRegistrationAccept(const nas::RegistrationAccept &msg)
 
     auto regType = m_lastRegistrationRequest->registrationType.registrationType;
 
-    if (regType == nas::ERegistrationType::INITIAL_REGISTRATION ||
-        regType == nas::ERegistrationType::EMERGENCY_REGISTRATION)
-    {
-        m_sm->establishInitialSessions();
-    }
-
     if (regType == nas::ERegistrationType::INITIAL_REGISTRATION)
         m_registeredForEmergency = false;
     else if (regType == nas::ERegistrationType::EMERGENCY_REGISTRATION)
         m_registeredForEmergency = true;
 
     m_logger->info("%s is successful", nas::utils::EnumToString(regType));
+
+    if (regType == nas::ERegistrationType::INITIAL_REGISTRATION ||
+        regType == nas::ERegistrationType::EMERGENCY_REGISTRATION)
+    {
+        m_sm->establishRequiredSessions();
+    }
 }
 
 void NasMm::receiveMobilityRegistrationAccept(const nas::RegistrationAccept &msg)

src/ue/nas/sm/resource.cpp

@@ -106,7 +106,7 @@ std::bitset<16> NasSm::getPduSessionStatus()
     return res;
 }
 
-void NasSm::establishInitialSessions()
+void NasSm::establishRequiredSessions()
 {
     if (m_base->config->initSessions.empty())
     {
@@ -114,7 +114,7 @@ void NasSm::establishInitialSessions()
         return;
     }
 
-    m_logger->debug("Initial PDU sessions are establishing [%d#]", m_base->config->initSessions.size());
+    //m_logger->debug("Initial PDU sessions are establishing [%d#]", m_base->config->initSessions.size());
 
     for (auto &sess : m_base->config->initSessions)
         sendEstablishmentRequest(sess);

src/ue/nas/sm/sm.hpp

@@ -51,7 +51,7 @@ class NasSm
     bool anyEmergencyUplinkDataPending();
     std::bitset<16> getUplinkDataStatus();
     std::bitset<16> getPduSessionStatus();
-    void establishInitialSessions();
+    void establishRequiredSessions();
 
   private: /* Transport */
     void receiveSmMessage(const nas::SmMessage &msg);