Performance improvements

src/ue/nas/layer.cpp

@@ -99,4 +99,14 @@ void NasLayer::handleRrcConnectionRelease()
     m_mm->handleRrcConnectionRelease();
 }
 
+void NasLayer::handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds)
+{
+    m_mm->handlePaging(tmsiIds);
+}
+
+void NasLayer::handleRrcFallbackIndication()
+{
+    m_mm->handleRrcFallbackIndication();
+}
+
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/layer.hpp

@@ -36,6 +36,8 @@ class NasLayer
     void performCycle();
     void handleSapMessage(std::unique_ptr<NtsMessage> msg);
     void handleRrcConnectionRelease();
+    void handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds);
+    void handleRrcFallbackIndication();
 };
 
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/mm/sap.cpp

@@ -35,10 +35,6 @@ void NasMm::handleRrcEvent(const NmUeRrcToNas &msg)
         handleRadioLinkFailure();
         break;
     }
-    case NmUeRrcToNas::PAGING: {
-        handlePaging(msg.pagingTmsi);
-        break;
-    }
     case NmUeRrcToNas::ACTIVE_CELL_CHANGED: {
         handleActiveCellChange(msg.previousTai);
         break;
@@ -47,10 +43,6 @@ void NasMm::handleRrcEvent(const NmUeRrcToNas &msg)
         handleRrcEstablishmentFailure();
         break;
     }
-    case NmUeRrcToNas::RRC_FALLBACK_INDICATION: {
-        handleRrcFallbackIndication();
-        break;
-    }
     }
 }
 

src/ue/nts.hpp

@@ -64,17 +64,12 @@ struct NmUeRrcToNas : NtsMessage
         RRC_CONNECTION_SETUP,
         RRC_ESTABLISHMENT_FAILURE,
         RADIO_LINK_FAILURE,
-        PAGING,
         ACTIVE_CELL_CHANGED,
-        RRC_FALLBACK_INDICATION,
     } present;
 
     // NAS_DELIVERY
     OctetString nasPdu;
 
-    // PAGING
-    std::vector<GutiMobileIdentity> pagingTmsi;
-
     // ACTIVE_CELL_CHANGED
     Tai previousTai;
 

src/ue/rrc/handler.cpp

@@ -52,9 +52,7 @@ void UeRrcLayer::receivePaging(const ASN_RRC_Paging &msg)
         }
     });
 
-    auto w = std::make_unique<NmUeRrcToNas>(NmUeRrcToNas::PAGING);
-    w->pagingTmsi = std::move(tmsiIds);
-    m_base->l3Task->push(std::move(w));
+    m_base->l3Task->nas().handlePaging(tmsiIds);
 }
 
 } // namespace nr::ue
\ No newline at end of file