L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -437,12 +437,16 @@ void NasMm::onSimRemoval()
 {
     m_storage->equivalentPlmnList->clear();
 
+    m_storage->serviceAreaList->clear();
+
     m_storage->forbiddenTaiListRoaming->clear();
     m_storage->forbiddenTaiListRps->clear();
 }
 
 void NasMm::onSwitchOff()
 {
+    m_storage->serviceAreaList->clear();
+
     m_storage->forbiddenTaiListRoaming->clear();
     m_storage->forbiddenTaiListRps->clear();
 }

src/ue/nas/mm/mm.hpp

@@ -169,9 +169,11 @@ class NasMm
     void handleRadioLinkFailure();
     void handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds);
 
-  private: /* Access Control */
+  public: /* Access Control */
     bool isHighPriority();
     bool hasEmergency();
+
+  private: /* Access Control */
     void setN1Capability(bool enabled);
     bool isInNonAllowedArea();
 
@@ -189,6 +191,7 @@ class NasMm
     bool isRegistered();                          // used by SM
     bool isRegisteredForEmergency();              // used by SM
     void serviceNeededForUplinkData();            // used by SM
+    bool isStateNonAllowedService();              // used by SM
 };
 
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/sm/establishment.cpp

@@ -47,6 +47,12 @@ void NasSm::sendEstablishmentRequest(const SessionConfig &config)
         return;
     }
 
+    if (m_mm->isStateNonAllowedService() && !m_mm->hasEmergency() && !m_mm->isHighPriority())
+    {
+        m_logger->err("PDU session establishment could not be triggered, non allowed service condition");
+        return;
+    }
+
     /* Control the received config */
     if (config.type != nas::EPduSessionType::IPV4)
     {

src/ue/nas/sm/release.cpp

@@ -18,6 +18,13 @@ namespace nr::ue
 
 void NasSm::sendReleaseRequest(int psi)
 {
+    /* Control the protocol state */
+    if (m_mm->isStateNonAllowedService() && !m_mm->hasEmergency() && !m_mm->isHighPriority())
+    {
+        m_logger->err("PDU session release could not start, non allowed service condition");
+        return;
+    }
+
     /* Control the PDU session state */
     auto &ps = m_pduSessions[psi];
     if (ps->psState != EPsState::ACTIVE)