UE SRA dev.

src/gnb/mr/task.cpp

@@ -171,11 +171,11 @@ void GnbMrTask::receiveUplinkPayload(int ue, rls::EPayloadType type, OctetString
 {
     if (type == rls::EPayloadType::RRC)
     {
-        auto *nw = new NwGnbMrToRrc(NwGnbMrToRrc::RRC_PDU_DELIVERY);
-        nw->ueId = ue;
-        nw->channel = static_cast<rrc::RrcChannel>(payload.getI(0));
-        nw->pdu = payload.subCopy(1);
-        m_base->rrcTask->push(nw);
+        //auto *nw = new NwGnbMrToRrc(NwGnbMrToRrc::RRC_PDU_DELIVERY);
+        //nw->ueId = ue;
+        //nw->channel = static_cast<rrc::RrcChannel>(payload.getI(0));
+        //nw->pdu = payload.subCopy(1);
+        //m_base->rrcTask->push(nw);
     }
     else if (type == rls::EPayloadType::DATA)
     {

src/gnb/nts.hpp

@@ -28,18 +28,12 @@ struct NwGnbMrToRrc : NtsMessage
 {
     enum PR
     {
-        RRC_PDU_DELIVERY,
         RADIO_LINK_FAILURE,
     } present;
 
-    // RRC_PDU_DELIVERY
     // RADIO_LINK_FAILURE
     int ueId{};
 
-    // RRC_PDU_DELIVERY
-    rrc::RrcChannel channel{};
-    OctetString pdu{};
-
     explicit NwGnbMrToRrc(PR present) : NtsMessage(NtsMessageType::GNB_MR_TO_RRC), present(present)
     {
     }

src/gnb/rrc/task.cpp

@@ -42,10 +42,6 @@ void GnbRrcTask::onLoop()
         auto *w = dynamic_cast<NwGnbMrToRrc *>(msg);
         switch (w->present)
         {
-        case NwGnbMrToRrc::RRC_PDU_DELIVERY: {
-            handleUplinkRrc(w->ueId, w->channel, w->pdu);
-            break;
-        }
         case NwGnbMrToRrc::RADIO_LINK_FAILURE: {
             handleRadioLinkFailure(w->ueId);
             break;
@@ -53,6 +49,17 @@ void GnbRrcTask::onLoop()
         }
         break;
     }
+    case NtsMessageType::GNB_SRA_TO_RRC: {
+        auto *w = dynamic_cast<NwGnbSraToRrc *>(msg);
+        switch (w->present)
+        {
+        case NwGnbSraToRrc::RRC_PDU_DELIVERY: {
+            handleUplinkRrc(w->ueId, w->channel, w->pdu);
+            break;
+        }
+        }
+        break;
+    }
     case NtsMessageType::GNB_NGAP_TO_RRC: {
         auto *w = dynamic_cast<NwGnbNgapToRrc *>(msg);
         switch (w->present)