L3 RRC/NAS developments

src/ue/nas/mm/auth.cpp

@@ -532,10 +532,7 @@ bool NasMm::networkFailingTheAuthCheck(bool hasChance)
     m_logger->err("Network failing the authentication check");
 
     if (m_cmState == ECmState::CM_CONNECTED)
-    {
-        localReleaseConnection();
-        // TODO: treat the active cell as barred
-    }
+        localReleaseConnection(true);
 
     m_timers->t3520.stop();
     return true;

src/ue/nas/mm/base.cpp

@@ -330,7 +330,7 @@ void NasMm::onSwitchMmState(EMmState oldState, EMmState newState, EMmSubState ol
     if (m_cmState == ECmState::CM_CONNECTED && (m_mmSubState == EMmSubState::MM_DEREGISTERED_PLMN_SEARCH ||
                                                 m_mmSubState == EMmSubState::MM_REGISTERED_PLMN_SEARCH))
     {
-        localReleaseConnection();
+        localReleaseConnection(false);
     }
 
     // "Timer T3512 is stopped when the UE enters ... the 5GMM-DEREGISTERED state over 3GPP access"

src/ue/nas/mm/mm.hpp

@@ -159,7 +159,7 @@ class NasMm
 
   private: /* Radio */
     void performPlmnSelection();
-    void localReleaseConnection();
+    void localReleaseConnection(bool treatBarred);
     void handleActiveCellChange(const Tai &prevTai);
     void handleRrcConnectionSetup();
     void handleRrcConnectionRelease();

src/ue/nas/mm/radio.cpp

@@ -251,14 +251,14 @@ void NasMm::handleRadioLinkFailure()
         switchMmState(EMmSubState::MM_DEREGISTERED_PS);
 }
 
-void NasMm::localReleaseConnection()
+void NasMm::localReleaseConnection(bool treatBarred)
 {
-    if (m_cmState == ECmState::CM_IDLE)
-        return;
-
-    m_logger->info("Performing local release of NAS connection");
+    if (m_cmState != ECmState::CM_IDLE)
+        m_logger->info("Performing local release of NAS connection");
 
-    m_base->rrcTask->push(new NmUeNasToRrc(NmUeNasToRrc::LOCAL_RELEASE_CONNECTION));
+    auto *w = new NmUeNasToRrc(NmUeNasToRrc::LOCAL_RELEASE_CONNECTION);
+    w->treatBarred = treatBarred;
+    m_base->rrcTask->push(w);
 }
 
 void NasMm::handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds)

src/ue/nas/mm/timer.cpp

@@ -74,7 +74,7 @@ void NasMm::onTimerExpire(UeTimer &timer)
                 if (m_lastRegistrationRequest->registrationType.registrationType !=
                     nas::ERegistrationType::EMERGENCY_REGISTRATION)
                 {
-                    localReleaseConnection();
+                    localReleaseConnection(false);
                 }
 
                 handleAbnormalInitialRegFailure(regType);
@@ -82,7 +82,7 @@ void NasMm::onTimerExpire(UeTimer &timer)
             else if (regType == nas::ERegistrationType::MOBILITY_REGISTRATION_UPDATING ||
                      regType == nas::ERegistrationType::PERIODIC_REGISTRATION_UPDATING)
             {
-                localReleaseConnection();
+                localReleaseConnection(false);
                 handleAbnormalMobilityRegFailure(regType);
             }
         }

src/ue/nts.hpp

@@ -101,6 +101,9 @@ struct NmUeNasToRrc : NtsMessage
     uint32_t pduId{};
     OctetString nasPdu;
 
+    // LOCAL_RELEASE_CONNECTION
+    bool treatBarred{};
+
     explicit NmUeNasToRrc(PR present) : NtsMessage(NtsMessageType::UE_NAS_TO_RRC), present(present)
     {
     }
@@ -191,9 +194,9 @@ struct NmUeNasToApp : NtsMessage
         DOWNLINK_DATA_DELIVERY
     } present;
 
-	// DOWNLINK_DATA_DELIVERY
-	int psi{};
-	OctetString data;
+    // DOWNLINK_DATA_DELIVERY
+    int psi{};
+    OctetString data;
 
     explicit NmUeNasToApp(PR present) : NtsMessage(NtsMessageType::UE_NAS_TO_APP), present(present)
     {