L3 RRC/NAS developments

src/ue/nas/mm/access.cpp

@@ -18,23 +18,28 @@ bool NasMm::hasEmergency()
 {
     // Indicates emergency services are required (even if registered for normal initial registration)
     // This happens if it 'has' or 'need' some emergency PDU Session, as well.
-
     if (m_rmState == ERmState::RM_REGISTERED && m_registeredForEmergency)
         return true;
+
     if (m_mmState == EMmState::MM_REGISTERED_INITIATED && m_lastRegistrationRequest &&
         m_lastRegistrationRequest->registrationType.registrationType == nas::ERegistrationType::EMERGENCY_REGISTRATION)
         return true;
+
     if (m_procCtl.initialRegistration && m_procCtl.initialRegistration == EInitialRegCause::EMERGENCY_SERVICES)
         return true;
+
     if (m_procCtl.mobilityRegistration && m_procCtl.mobilityRegistration == ERegUpdateCause::EMERGENCY_CASE)
         return true;
+
     if (m_procCtl.serviceRequest && m_procCtl.serviceRequest == EServiceReqCause::EMERGENCY_FALLBACK)
         return true;
 
-    // TODO: Other case which is an emergency PDU session need to be established (and wanted to be
-    //  established soon)
     if (m_sm->anyEmergencySession())
         return true;
+
+    if (m_usim->m_emgIndication)
+        return true;
+
     return false;
 }
 

src/ue/nas/usim/usim.hpp

@@ -35,7 +35,8 @@ class Usim
     std::unique_ptr<SqnManager> m_sqnMng{};
 
     // Others
-    bool m_isECallOnly{}; // todo: configurable
+    bool m_isECallOnly = false;   // todo: configurable
+    bool m_emgIndication = false; // todo: configurable
 
   public:
     void initialize(bool hasSupi, const UeConfig::Initials &initials);