MM refactor

src/ue/mm/interface.cpp

@@ -62,4 +62,9 @@ void NasMm::handleNasEvent(const NwUeNasToNas &msg)
     }
 }
 
+void NasMm::deliverUlTransport(const nas::UlNasTransport &msg)
+{
+    sendNasMessage(msg);
+}
+
 } // namespace nr::ue

src/ue/mm/mm.hpp

@@ -74,10 +74,8 @@ class NasMm
     void onSwitchCmState(ECmState oldState, ECmState newState);
     void onSwitchUState(E5UState oldState, E5UState newState);
 
-  public: /* Transport */
-    void sendNasMessage(const nas::PlainMmMessage &msg);
-
   private: /* Transport */
+    void sendNasMessage(const nas::PlainMmMessage &msg);
     void receiveNasMessage(const nas::NasMessage &msg);
     void receiveMmMessage(const nas::PlainMmMessage &msg);
     void receiveDlNasTransport(const nas::DlNasTransport &msg);
@@ -163,6 +161,7 @@ class NasMm
   public: /* Interface */
     void handleRrcEvent(const NwUeRrcToNas &msg);
     void handleNasEvent(const NwUeNasToNas &msg);
+    void deliverUlTransport(const nas::UlNasTransport &msg);
 };
 
 } // namespace nr::ue
\ No newline at end of file

src/ue/sm/transport.cpp

@@ -31,7 +31,7 @@ void NasSm::sendSmMessage(int psi, const nas::SmMessage &msg)
     if (session.apn.has_value())
         m.dnn = nas::utils::DnnFromApn(*session.apn);
 
-    m_mm->sendNasMessage(m);
+    m_mm->deliverUlTransport(m);
 }
 
 void NasSm::receiveSmMessage(const nas::SmMessage &msg)