L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -428,10 +428,14 @@ void NasMm::onSwitchUState(E5UState oldState, E5UState newState)
 
 void NasMm::onSimRemoval()
 {
+    m_storage->forbiddenTaiListRoaming->clear();
+    m_storage->forbiddenTaiListRps->clear();
 }
 
 void NasMm::onSwitchOff()
 {
+    m_storage->forbiddenTaiListRoaming->clear();
+    m_storage->forbiddenTaiListRps->clear();
 }
 
 } // namespace nr::ue

src/ue/nas/storage.cpp

@@ -29,8 +29,6 @@ MmStorage::MmStorage(TaskBase *base) : m_base{base}
 
     storedGuti = std::make_unique<nas::NasSlot<nas::IE5gsMobileIdentity>>(0, std::nullopt);
 
-    taiList = std::make_unique<nas::NasSlot<nas::IE5gsTrackingAreaIdentityList>>(0, std::nullopt);
-
     lastVisitedRegisteredTai = std::make_unique<nas::NasSlot<Tai>>(0, std::nullopt);
 
     forbiddenTaiListRoaming = std::make_unique<nas::NasList<Tai>>(
@@ -44,6 +42,8 @@ MmStorage::MmStorage(TaskBase *base) : m_base{base}
         });
 
     serviceAreaList = std::make_unique<nas::NasSlot<nas::IEServiceAreaList>>(0, std::nullopt);
+
+    taiList = std::make_unique<nas::NasSlot<nas::IE5gsTrackingAreaIdentityList>>(0, std::nullopt);
 }
 
 } // namespace nr::ue
\ No newline at end of file