UE SRA dev.

src/ue/mm/auth.cpp

@@ -80,7 +80,7 @@ void NasMm::receiveAuthenticationRequestEap(const nas::AuthenticationRequest &ms
 
     auto sqnXorAk = OctetString::Xor(m_usim->m_sqn, milenageAk);
     auto ckPrimeIkPrime =
-        keys::CalculateCkPrimeIkPrime(ck, ik, keys::ConstructServingNetworkName(m_usim->m_currentPlmn), sqnXorAk);
+        keys::CalculateCkPrimeIkPrime(ck, ik, keys::ConstructServingNetworkName(*m_usim->m_currentPlmn), sqnXorAk);
     auto &ckPrime = ckPrimeIkPrime.first;
     auto &ikPrime = ckPrimeIkPrime.second;
 
@@ -198,7 +198,7 @@ void NasMm::receiveAuthenticationRequestEap(const nas::AuthenticationRequest &ms
     m_usim->m_nonCurrentNsCtx->keys.kAusf = std::move(kAusf);
     m_usim->m_nonCurrentNsCtx->keys.abba = msg.abba.rawData.copy();
 
-    keys::DeriveKeysSeafAmf(*m_base->config, m_usim->m_currentPlmn, *m_usim->m_nonCurrentNsCtx);
+    keys::DeriveKeysSeafAmf(*m_base->config, *m_usim->m_currentPlmn, *m_usim->m_nonCurrentNsCtx);
 
     // m_logger->debug("kSeaf: %s", m_usim->m_nonCurrentNsCtx->keys.kSeaf.toHexString().c_str());
     // m_logger->debug("kAmf: %s", m_usim->m_nonCurrentNsCtx->keys.kAmf.toHexString().c_str());
@@ -266,7 +266,7 @@ void NasMm::receiveAuthenticationRequest5gAka(const nas::AuthenticationRequest &
     auto &milenageAk = milenage.ak;
     auto &milenageMac = milenage.mac_a;
     auto sqnXorAk = OctetString::Xor(m_usim->m_sqn, milenageAk);
-    auto snn = keys::ConstructServingNetworkName(m_usim->m_currentPlmn);
+    auto snn = keys::ConstructServingNetworkName(*m_usim->m_currentPlmn);
 
     // m_logger->debug("Calculated res[%s] ck[%s] ik[%s] ak[%s] mac_a[%s]", res.toHexString().c_str(),
     //                ck.toHexString().c_str(), ik.toHexString().c_str(), milenageAk.toHexString().c_str(),
@@ -287,7 +287,7 @@ void NasMm::receiveAuthenticationRequest5gAka(const nas::AuthenticationRequest &
         m_usim->m_nonCurrentNsCtx->keys.kAusf = keys::CalculateKAusfFor5gAka(ck, ik, snn, sqnXorAk);
         m_usim->m_nonCurrentNsCtx->keys.abba = msg.abba.rawData.copy();
 
-        keys::DeriveKeysSeafAmf(*m_base->config, m_usim->m_currentPlmn, *m_usim->m_nonCurrentNsCtx);
+        keys::DeriveKeysSeafAmf(*m_base->config, *m_usim->m_currentPlmn, *m_usim->m_nonCurrentNsCtx);
 
         // m_logger->debug("Derived kSeaf[%s] kAusf[%s] kAmf[%s]",
         //                m_usim->m_nonCurrentNsCtx->keys.kSeaf.toHexString().c_str(),

src/ue/mm/identity.cpp

@@ -56,7 +56,7 @@ nas::IE5gsMobileIdentity NasMm::getOrGenerateSuci()
 nas::IE5gsMobileIdentity NasMm::generateSuci()
 {
     auto &supi = m_base->config->supi;
-    auto &plmn = m_usim->m_currentPlmn;
+    auto &plmn = m_base->config->hplmn;
 
     if (!supi.has_value())
         return {};

src/ue/mm/radio.cpp

@@ -178,9 +178,13 @@ void NasMm::handleServingCellChange(const UeCellInfo &servingCell)
         else
             switchMmState(EMmState::MM_DEREGISTERED, isSuitable ? EMmSubState::MM_DEREGISTERED_NORMAL_SERVICE
                                                                 : EMmSubState::MM_DEREGISTERED_LIMITED_SERVICE);
-
-        resetRegAttemptCounter();
     }
+    // todo: else, other states abnormal case
+
+    resetRegAttemptCounter();
+
+    m_usim->m_servingCell = servingCell;
+    m_usim->m_currentPlmn = servingCell.cellId.plmn;
 }
 
 void NasMm::handleRrcConnectionSetup()

src/ue/mm/register.cpp

@@ -230,7 +230,7 @@ void NasMm::receiveInitialRegistrationAccept(const nas::RegistrationAccept &msg)
         });
     }
     // .. in addition, the UE shall add to the stored list the PLMN code of the registered PLMN that sent the list
-    nas::utils::AddToPlmnList(m_usim->m_equivalentPlmnList, nas::utils::PlmnFrom(m_usim->m_currentPlmn));
+    nas::utils::AddToPlmnList(m_usim->m_equivalentPlmnList, nas::utils::PlmnFrom(*m_usim->m_currentPlmn));
 
     // Upon receipt of the REGISTRATION ACCEPT message, the UE shall reset the registration attempt counter, enter state
     // 5GMM-REGISTERED and set the 5GS update status to 5U1 UPDATED.
@@ -337,7 +337,7 @@ void NasMm::receiveMobilityRegistrationAccept(const nas::RegistrationAccept &msg
         });
     }
     // .. in addition, the UE shall add to the stored list the PLMN code of the registered PLMN that sent the list
-    nas::utils::AddToPlmnList(m_usim->m_equivalentPlmnList, nas::utils::PlmnFrom(m_usim->m_currentPlmn));
+    nas::utils::AddToPlmnList(m_usim->m_equivalentPlmnList, nas::utils::PlmnFrom(*m_usim->m_currentPlmn));
 
     // Store the service area list
     m_usim->m_serviceAreaList = msg.serviceAreaList.value_or(nas::IEServiceAreaList{});
@@ -547,7 +547,7 @@ void NasMm::receiveInitialRegistrationReject(const nas::RegistrationReject &msg)
 
         if (cause == nas::EMmCause::PLMN_NOT_ALLOWED || cause == nas::EMmCause::SERVING_NETWORK_NOT_AUTHORIZED)
         {
-            nas::utils::AddToPlmnList(m_usim->m_forbiddenPlmnList, nas::utils::PlmnFrom(m_usim->m_currentPlmn));
+            nas::utils::AddToPlmnList(m_usim->m_forbiddenPlmnList, nas::utils::PlmnFrom(*m_usim->m_currentPlmn));
         }
 
         if (cause == nas::EMmCause::CONGESTION)
@@ -707,7 +707,7 @@ void NasMm::receiveMobilityRegistrationReject(const nas::RegistrationReject &msg
 
     if (cause == nas::EMmCause::PLMN_NOT_ALLOWED || cause == nas::EMmCause::SERVING_NETWORK_NOT_AUTHORIZED)
     {
-        nas::utils::AddToPlmnList(m_usim->m_forbiddenPlmnList, nas::utils::PlmnFrom(m_usim->m_currentPlmn));
+        nas::utils::AddToPlmnList(m_usim->m_forbiddenPlmnList, nas::utils::PlmnFrom(*m_usim->m_currentPlmn));
     }
 
     if (cause == nas::EMmCause::CONGESTION)

src/ue/nas/task.cpp

@@ -29,7 +29,6 @@ NasTask::NasTask(TaskBase *base) : base{base}, timers{}
 void NasTask::onStart()
 {
     usim->initialize(base->config->supi.has_value(), base->config->initials);
-    usim->m_currentPlmn = base->config->hplmn; // TODO: normally assigned after plmn search
 
     sm->onStart(mm);
     mm->onStart(sm, usim);

src/ue/nas/usim.hpp

@@ -27,15 +27,14 @@ class Usim
     // State related
     E5UState m_uState{};
 
-    // Location related
-    std::optional<nas::IE5gsTrackingAreaIdentity> m_lastVisitedRegisteredTai{};
-
     // Identity related
     nas::IE5gsMobileIdentity m_storedSuci{};
     nas::IE5gsMobileIdentity m_storedGuti{};
 
     // Plmn related
-    Plmn m_currentPlmn{};
+    std::optional<UeCellInfo> m_servingCell{};
+    std::optional<Plmn> m_currentPlmn{};
+    std::optional<nas::IE5gsTrackingAreaIdentity> m_lastVisitedRegisteredTai{};
     nas::IE5gsTrackingAreaIdentityList m_taiList{};
     nas::IE5gsTrackingAreaIdentityList m_forbiddenTaiList{};
     nas::IEPlmnList m_equivalentPlmnList{};