Security mode command procedure improvement

src/ue/nas/mm/mm.hpp

@@ -42,6 +42,8 @@ class NasMm
     std::unique_ptr<nas::ServiceRequest> m_lastServiceRequest{};
     // Most recent de-registration request
     std::unique_ptr<nas::DeRegistrationRequestUeOriginating> m_lastDeregistrationRequest{};
+    // Indicates that last registration request was sent without a NAS security context
+    bool m_lastRegWithoutNsc{};
     // Indicates the last de-registration cause
     EDeregCause m_lastDeregCause{};
     // Indicates the last service request cause

src/ue/nas/mm/register.cpp

@@ -97,6 +97,7 @@ void NasMm::sendInitialRegistration(EInitialRegCause regCause)
     // Send the message
     sendNasMessage(*request);
     m_lastRegistrationRequest = std::move(request);
+    m_lastRegWithoutNsc = m_usim->m_currentNsCtx == nullptr;
 
     // Process timers
     m_timers->t3510.start();
@@ -187,6 +188,7 @@ void NasMm::sendMobilityRegistration(ERegUpdateCause updateCause)
     // Send the message
     sendNasMessage(*request);
     m_lastRegistrationRequest = std::move(request);
+    m_lastRegWithoutNsc = m_usim->m_currentNsCtx == nullptr;
 
     // Process timers
     m_timers->t3510.start();