UE generic configuration update improvement

src/ue/nas/mm/config.cpp

@@ -9,6 +9,7 @@
 #include "mm.hpp"
 
 #include <lib/nas/utils.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {
@@ -127,6 +128,14 @@ void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &ms
         }
     }
 
+    // "If acknowledgement requested is indicated in the Configuration update indication IE in the CONFIGURATION UPDATE
+    //  COMMAND message, the UE shall send a CONFIGURATION UPDATE COMPLETE message."
+    if (msg.configurationUpdateIndication.has_value() &&
+        msg.configurationUpdateIndication->ack == nas::EAcknowledgement::REQUESTED)
+    {
+        sendNasMessage(nas::ConfigurationUpdateComplete{});
+    }
+
     // "If the CONFIGURATION UPDATE COMMAND message indicates "registration requested" in the Configuration update
     //  indication IE and:"
     if (msg.configurationUpdateIndication.has_value() &&
@@ -137,7 +146,7 @@ void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &ms
         if (!hasNewConfig || (msg.allowedNssai.has_value() || msg.configuredNssai.has_value() ||
                               msg.networkSlicingIndication.has_value()))
         {
-            if (hasEmergency()) // "an emergency PDU session exists,"
+            if (m_sm->anyEmergencySession()) // "an emergency PDU session exists,"
             {
                 // "the UE shall, after the completion of the generic UE configuration
                 //  update procedure and after the emergency PDU session is released, release the existing N1 NAS
@@ -163,14 +172,6 @@ void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &ms
             // TODO
         }
     }
-
-    // "If acknowledgement requested is indicated in the Configuration update indication IE in the CONFIGURATION UPDATE
-    //  COMMAND message, the UE shall send a CONFIGURATION UPDATE COMPLETE message."
-    if (msg.configurationUpdateIndication.has_value() &&
-        msg.configurationUpdateIndication->ack == nas::EAcknowledgement::REQUESTED)
-    {
-        sendNasMessage(nas::ConfigurationUpdateComplete{});
-    }
 }
 
 } // namespace nr::ue