L3 RRC/NAS developments

src/ue/rrc/idle.cpp

@@ -31,7 +31,7 @@ void UeRrcTask::performCellSelection()
 
     bool shouldLogErrors = lastCell != 0 || (currentTime - m_lastTimePlmnSearchFailureLogged >= 30'000LL);
 
-    CurrentCellInfo cellInfo;
+    ActiveCellInfo cellInfo;
     CellSelectionReport report;
 
     bool cellFound = false;
@@ -107,7 +107,7 @@ void UeRrcTask::performCellSelection()
     }
 }
 
-bool UeRrcTask::lookForSuitableCell(CurrentCellInfo &cellInfo, CellSelectionReport &report)
+bool UeRrcTask::lookForSuitableCell(ActiveCellInfo &cellInfo, CellSelectionReport &report)
 {
     Plmn selectedPlmn = m_base->shCtx.selectedPlmn.get();
     if (!selectedPlmn.hasValue())
@@ -190,7 +190,7 @@ bool UeRrcTask::lookForSuitableCell(CurrentCellInfo &cellInfo, CellSelectionRepo
     return true;
 }
 
-bool UeRrcTask::lookForAcceptableCell(CurrentCellInfo &cellInfo, CellSelectionReport &report)
+bool UeRrcTask::lookForAcceptableCell(ActiveCellInfo &cellInfo, CellSelectionReport &report)
 {
     std::vector<int> candidates;
 

src/ue/rrc/task.hpp

@@ -100,8 +100,8 @@ class UeRrcTask : public NtsTask
 
     /* Idle Mode Operations */
     void performCellSelection();
-    bool lookForSuitableCell(CurrentCellInfo &cellInfo, CellSelectionReport &report);
-    bool lookForAcceptableCell(CurrentCellInfo &cellInfo, CellSelectionReport &report);
+    bool lookForSuitableCell(ActiveCellInfo &cellInfo, CellSelectionReport &report);
+    bool lookForAcceptableCell(ActiveCellInfo &cellInfo, CellSelectionReport &report);
 
     /* Cell Management */
     void handleCellSignalChange(int cellId, int dbm);

src/ue/types.cpp

@@ -289,7 +289,7 @@ Json ToJson(const EServiceReqCause &v)
     }
 }
 
-bool CurrentCellInfo::hasValue() const
+bool ActiveCellInfo::hasValue() const
 {
     return cellId != 0;
 }

src/ue/types.hpp

@@ -148,7 +148,7 @@ struct CellSelectionReport
     int forbiddenTaiCells{};
 };
 
-struct CurrentCellInfo
+struct ActiveCellInfo
 {
     int cellId{};
     ECellCategory category{};
@@ -162,7 +162,7 @@ struct UeSharedContext
 {
     Locked<std::unordered_set<Plmn>> availablePlmns;
     Locked<Plmn> selectedPlmn;
-    Locked<CurrentCellInfo> currentCell;
+    Locked<ActiveCellInfo> currentCell;
     Locked<std::vector<Tai>> forbiddenTaiRoaming;
     Locked<std::vector<Tai>> forbiddenTaiRps;