Service request abnormal case handling improvements

src/ue/nas/mm/dereg.cpp

@@ -158,6 +158,13 @@ void NasMm::receiveDeregistrationRequest(const nas::DeRegistrationRequestUeTermi
             forceIgnoreReregistration = true;
         }
     }
+    // 5.6.1.7 Abnormal cases in the UE (de-registration collision)
+    else if (m_mmState == EMmState::MM_SERVICE_REQUEST_INITIATED)
+    {
+        // "UE shall progress the DEREGISTRATION REQUEST message and the service request procedure shall be aborted."
+        // (no specific action is required herein to abort service request procedure)
+        (void)0;
+    }
 
     bool reRegistrationRequired =
         msg.deRegistrationType.reRegistrationRequired == nas::EReRegistrationRequired::REQUIRED &&

src/ue/nas/mm/register.cpp

@@ -125,6 +125,13 @@ void NasMm::sendMobilityRegistration(ERegUpdateCause updateCause)
         }
     }
 
+    // 5.6.1.7 Abnormal cases in the UE
+    // d) Registration procedure for mobility and periodic registration update is triggered
+    if (m_mmState == EMmState::MM_SERVICE_REQUEST_INITIATED)
+    {
+        m_timers->t3517.stop();
+    }
+
     m_logger->debug("Sending %s with update cause [%s]",
                     nas::utils::EnumToString(updateCause == ERegUpdateCause::T3512_EXPIRY
                                                  ? nas::ERegistrationType::PERIODIC_REGISTRATION_UPDATING