L3 RRC/NAS developments

src/gnb/nts.hpp

@@ -63,7 +63,7 @@ struct NwGnbRlsToGtp : NtsMessage
     // DATA_PDU_DELIVERY
     int ueId{};
     int psi{};
-    OctetString pdu{};
+    OctetString pdu;
 
     explicit NwGnbRlsToGtp(PR present) : NtsMessage(NtsMessageType::GNB_RLS_TO_GTP), present(present)
     {

src/gnb/rls/task.cpp

@@ -8,6 +8,7 @@
 
 #include "task.hpp"
 
+#include <gnb/gtp/task.hpp>
 #include <gnb/rrc/task.hpp>
 #include <utils/common.hpp>
 
@@ -55,7 +56,11 @@ void GnbRlsTask::onLoop()
             break;
         }
         case NwGnbRlsToRls::UPLINK_DATA: {
-            m_logger->debug("UPLINK_DATA ue[%d] psi[%d]", w->ueId, w->psi);
+            auto *m = new NwGnbRlsToGtp(NwGnbRlsToGtp::DATA_PDU_DELIVERY);
+            m->ueId = w->ueId;
+            m->psi = w->psi;
+            m->pdu = std::move(w->data);
+            m_base->gtpTask->push(m);
             break;
         }
         case NwGnbRlsToRls::UPLINK_RRC: {

src/ue/rls/task.cpp

@@ -102,7 +102,20 @@ void UeRlsTask::onLoop()
             break;
         }
         }
-
+        break;
+    }
+    case NtsMessageType::UE_NAS_TO_RLS: {
+        auto *w = dynamic_cast<NwUeNasToRls *>(msg);
+        switch (w->present)
+        {
+        case NwUeNasToRls::DATA_PDU_DELIVERY: {
+            auto *m = new NwUeRlsToRls(NwUeRlsToRls::UPLINK_DATA);
+            m->psi = w->psi;
+            m->data = std::move(w->pdu);
+            m_ctlTask->push(m);
+            break;
+        }
+        }
         break;
     }
     default: