L3 RRC/NAS developments

src/ue/nas/mm/register.cpp

@@ -113,6 +113,15 @@ void NasMm::sendMobilityRegistration(ERegUpdateCause updateCause)
         return;
     }
 
+    if (m_mmSubState == EMmSubState::MM_REGISTERED_NON_ALLOWED_SERVICE)
+    {
+        if (!isHighPriority() && !hasEmergency())
+        {
+            m_logger->debug("Mobility updating canceled, registered in non allowed service");
+            return;
+        }
+    }
+
     // 5.5.1.3.7 Abnormal cases in the UE
     // a) Timer T3346 is running.
     if (m_timers->t3346.isRunning())
@@ -121,7 +130,7 @@ void NasMm::sendMobilityRegistration(ERegUpdateCause updateCause)
                        isHighPriority() || hasEmergency() || updateCause == ERegUpdateCause::CONFIGURATION_UPDATE;
         if (!allowed)
         {
-            m_logger->debug("Mobility updating updating canceled, T3346 is running");
+            m_logger->debug("Mobility updating canceled, T3346 is running");
             return;
         }
     }

src/ue/nas/mm/service.cpp

@@ -46,14 +46,25 @@ void NasMm::sendServiceRequest(EServiceReqCause reqCause)
         return;
     }
 
+    if (m_mmSubState == EMmSubState::MM_REGISTERED_NON_ALLOWED_SERVICE)
+    {
+        if (reqCause != EServiceReqCause::IDLE_PAGING &&
+            reqCause != EServiceReqCause::CONNECTED_3GPP_NOTIFICATION_N3GPP &&
+            reqCause != EServiceReqCause::IDLE_3GPP_NOTIFICATION_N3GPP && !isHighPriority() && !hasEmergency())
+        {
+            m_logger->debug("Service Request canceled, registered in non allowed service");
+            return;
+        }
+    }
+
     // 5.6.1.7 Abnormal cases in the UE
     // a) Timer T3525
     if (m_timers->t3525.isRunning())
     {
         if (reqCause != EServiceReqCause::IDLE_PAGING &&
             reqCause != EServiceReqCause::CONNECTED_3GPP_NOTIFICATION_N3GPP &&
-            reqCause != EServiceReqCause::IDLE_3GPP_NOTIFICATION_N3GPP && !isHighPriority() && !hasEmergency() &&
-            reqCause != EServiceReqCause::EMERGENCY_FALLBACK)
+            reqCause != EServiceReqCause::IDLE_3GPP_NOTIFICATION_N3GPP &&
+            reqCause != EServiceReqCause::EMERGENCY_FALLBACK && !isHighPriority() && !hasEmergency())
         {
             m_logger->debug("Service Request canceled, T3346 is running");
             return;