L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -143,6 +143,10 @@ void NasMm::performMmCycle()
         return;
     }
 
+    /* Automatic initial registration */
+    if (m_mmSubState == EMmSubState::MM_DEREGISTERED_NORMAL_SERVICE && !m_timers->t3346.isRunning())
+        initialRegistrationRequired(EInitialRegCause::MM_DEREG_NORMAL_SERVICE);
+
     /* Check for uplink data pending */
     if (m_sm->anyUplinkDataPending() || missingSessionBearer())
         serviceRequestRequiredForData();
@@ -170,10 +174,6 @@ void NasMm::performMmCycle()
         return;
     }
 
-    /* Automatic initial registration */
-    if (m_mmSubState == EMmSubState::MM_DEREGISTERED_NORMAL_SERVICE && !m_timers->t3346.isRunning())
-        initialRegistrationRequired(EInitialRegCause::MM_DEREG_NORMAL_SERVICE);
-
     /* Try to start procedures */
     invokeProcedures();
 }

src/ue/nas/mm/radio.cpp

@@ -292,8 +292,9 @@ void NasMm::updateProvidedGuti(bool provide)
 
 bool NasMm::missingSessionBearer()
 {
+    // This control is only valid in CM-CONNECTED
     if (m_cmState == ECmState::CM_IDLE)
-        return true;
+        return false;
 
     // TODO
     return false;