Performance improvements

src/ue/nas/layer.cpp

@@ -119,4 +119,14 @@ void NasLayer::handleRadioLinkFailure()
     m_mm->handleRadioLinkFailure();
 }
 
+void NasLayer::handleRrcEstablishmentFailure()
+{
+    m_mm->handleRrcEstablishmentFailure();
+}
+
+void NasLayer::handleActiveCellChange(const Tai &prevTai)
+{
+    m_mm->handleActiveCellChange(prevTai);
+}
+
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/layer.hpp

@@ -40,6 +40,8 @@ class NasLayer
     void handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds);
     void handleRrcFallbackIndication();
     void handleRadioLinkFailure();
+    void handleRrcEstablishmentFailure();
+    void handleActiveCellChange(const Tai &prevTai);
 };
 
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/mm/sap.cpp

@@ -27,14 +27,6 @@ void NasMm::handleRrcEvent(const NmUeRrcToNas &msg)
             receiveNasMessage(*nasMessage);
         break;
     }
-    case NmUeRrcToNas::ACTIVE_CELL_CHANGED: {
-        handleActiveCellChange(msg.previousTai);
-        break;
-    }
-    case NmUeRrcToNas::RRC_ESTABLISHMENT_FAILURE: {
-        handleRrcEstablishmentFailure();
-        break;
-    }
     }
 }
 

src/ue/nts.hpp

@@ -61,16 +61,11 @@ struct NmUeRrcToNas : NtsMessage
     enum PR
     {
         NAS_DELIVERY,
-        RRC_ESTABLISHMENT_FAILURE,
-        ACTIVE_CELL_CHANGED,
     } present;
 
     // NAS_DELIVERY
     OctetString nasPdu;
 
-    // ACTIVE_CELL_CHANGED
-    Tai previousTai;
-
     explicit NmUeRrcToNas(PR present) : NtsMessage(NtsMessageType::UE_RRC_TO_NAS), present(present)
     {
     }

src/ue/rrc/cells.cpp

@@ -70,9 +70,7 @@ void UeRrcLayer::notifyCellLost(int cellId)
             declareRadioLinkFailure(rls::ERlfCause::SIGNAL_LOST_TO_CONNECTED_CELL);
         else
         {
-            auto w = std::make_unique<NmUeRrcToNas>(NmUeRrcToNas::ACTIVE_CELL_CHANGED);
-            w->previousTai = Tai{lastActiveCell.plmn, lastActiveCell.tac};
-            m_base->l3Task->push(std::move(w));
+            m_base->l3Task->nas().handleActiveCellChange(Tai{lastActiveCell.plmn, lastActiveCell.tac});
         }
     }
 

src/ue/rrc/connection.cpp

@@ -154,7 +154,7 @@ void UeRrcLayer::receiveRrcRelease(const ASN_RRC_RRCRelease &msg)
 
 void UeRrcLayer::handleEstablishmentFailure()
 {
-    m_base->l3Task->push(std::make_unique<NmUeRrcToNas>(NmUeRrcToNas::RRC_ESTABLISHMENT_FAILURE));
+    m_base->l3Task->nas().handleRrcEstablishmentFailure();
 }
 
 void UeRrcLayer::performLocalRelease(bool treatBarred)

src/ue/rrc/idle.cpp

@@ -104,9 +104,7 @@ void UeRrcLayer::performCellSelection()
         w1->cellId = selectedCell;
         m_base->rlsTask->push(std::move(w1));
 
-        auto w2 = std::make_unique<NmUeRrcToNas>(NmUeRrcToNas::ACTIVE_CELL_CHANGED);
-        w2->previousTai = Tai{lastCell.plmn, lastCell.tac};
-        m_base->l3Task->push(std::move(w2));
+        m_base->l3Task->nas().handleActiveCellChange(Tai{lastCell.plmn, lastCell.tac});
     }
 }