L3 RRC/NAS developments

src/ue/nas/mm/mm.hpp

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

src/ue/nas/mm/radio.cpp

@@ -148,7 +148,7 @@ void NasMm::performPlmnSelection()
     }
 }
 
-void NasMm::handleActiveCellChange()
+void NasMm::handleActiveCellChange(const Tai &prevTai)
 {
     if (m_cmState == ECmState::CM_CONNECTED)
     {
@@ -163,6 +163,15 @@ void NasMm::handleActiveCellChange()
     if (currentCell.hasValue() && !m_storage->equivalentPlmnList->contains(currentCell.plmn))
         m_timers->t3346.stop();
 
+    if (currentCell.hasValue() && prevTai != currentTai)
+    {
+        if (m_mmSubState == EMmSubState::MM_DEREGISTERED_ATTEMPTING_REGISTRATION ||
+            m_mmSubState == EMmSubState::MM_REGISTERED_ATTEMPTING_REGISTRATION_UPDATE)
+        {
+            resetRegAttemptCounter();
+        }
+    }
+
     if (m_mmState == EMmState::MM_REGISTERED)
     {
         if (currentCell.cellId == 0)

src/ue/nas/mm/sap.cpp

@@ -45,7 +45,7 @@ void NasMm::handleRrcEvent(const NwUeRrcToNas &msg)
         break;
     }
     case NwUeRrcToNas::ACTIVE_CELL_CHANGED: {
-        handleActiveCellChange();
+        handleActiveCellChange(msg.previousTai);
         break;
     }
     case NwUeRrcToNas::RRC_ESTABLISHMENT_FAILURE: {

src/ue/nts.hpp

@@ -79,6 +79,9 @@ struct NwUeRrcToNas : NtsMessage
     // PAGING
     std::vector<GutiMobileIdentity> pagingTmsi;
 
+    // ACTIVE_CELL_CHANGED
+    Tai previousTai;
+
     explicit NwUeRrcToNas(PR present) : NtsMessage(NtsMessageType::UE_RRC_TO_NAS), present(present)
     {
     }

src/ue/rrc/idle.cpp

@@ -27,9 +27,9 @@ void UeRrcTask::performCellSelection()
     if (currentTime - m_startedTime <= 1000LL && m_cellDesc.empty())
         return;
 
-    int lastCell = m_base->shCtx.currentCell.get<int>([](auto &value) { return value.cellId; });
+    auto lastCell = m_base->shCtx.currentCell.get();
 
-    bool shouldLogErrors = lastCell != 0 || (currentTime - m_lastTimePlmnSearchFailureLogged >= 30'000LL);
+    bool shouldLogErrors = lastCell.cellId != 0 || (currentTime - m_lastTimePlmnSearchFailureLogged >= 30'000LL);
 
     ActiveCellInfo cellInfo;
     CellSelectionReport report;
@@ -92,17 +92,18 @@ void UeRrcTask::performCellSelection()
     int selectedCell = cellInfo.cellId;
     m_base->shCtx.currentCell.set(cellInfo);
 
-    if (selectedCell != 0 && selectedCell != lastCell)
+    if (selectedCell != 0 && selectedCell != lastCell.cellId)
         m_logger->info("Selected cell plmn[%s] tac[%d] category[%s]", ToJson(cellInfo.plmn).str().c_str(), cellInfo.tac,
                        ToJson(cellInfo.category).str().c_str());
 
-    if (selectedCell != lastCell)
+    if (selectedCell != lastCell.cellId)
     {
         auto *w1 = new NwUeRrcToRls(NwUeRrcToRls::ASSIGN_CURRENT_CELL);
         w1->cellId = selectedCell;
         m_base->rlsTask->push(w1);
 
         auto w2 = new NwUeRrcToNas(NwUeRrcToNas::ACTIVE_CELL_CHANGED);
+        w2->previousTai = Tai{lastCell.plmn, lastCell.tac};
         m_base->nasTask->push(w2);
     }
 }