new-task-test

common/utils/ocp_itti/intertask_interface.h

@@ -337,6 +337,7 @@ void *rrc_enb_process_msg(void *);
   TASK_DEF(TASK_NAS_UE, TASK_PRIORITY_MED, 200, NULL, NULL)          \
   TASK_DEF(TASK_RAL_UE, TASK_PRIORITY_MED, 200, NULL, NULL)          \
   TASK_DEF(TASK_GTPV1_U, TASK_PRIORITY_MED, 1000, NULL, NULL)        \
+  TASK_DEF(TASK_PDCP_GTP, TASK_PRIORITY_MED, 1000, NULL, NULL)        \
   TASK_DEF(TASK_CU_F1, TASK_PRIORITY_MED, 200, NULL, NULL)           \
   TASK_DEF(TASK_DU_F1, TASK_PRIORITY_MED, 200, NULL, NULL)           \
   TASK_DEF(TASK_SP, TASK_PRIORITY_MED, 200, NULL, NULL)              \

executables/nr-cuup.c

@@ -135,6 +135,8 @@ int main(int argc, char **argv)
   AssertFatal(rc >= 0, "Create task for CUUP E1 failed\n");
   rc = itti_create_task(TASK_SP, SP_task, NULL);
   AssertFatal(rc >= 0, "Create task for SP failed\n");
+  rc = itti_create_task(TASK_PDCP_GTP, pdcp_gtp_Task, NULL);
+  AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
   nr_pdcp_layer_init();
   MessageDef *msg = RCconfig_NR_CU_E1(true);
   AssertFatal(msg != NULL, "Send init to task for E1AP UP failed\n");

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -678,7 +678,7 @@ static void deliver_pdu_drb(void *deliver_pdu_data, ue_id_t ue_id, int rb_id,
     LOG_I(PDCP, "%s() (drb %d) sending message to gtp size %d\n",
 	  __func__, rb_id, size);
     extern instance_t CUuniqInstance;
-    itti_send_msg_to_task(TASK_GTPV1_U, CUuniqInstance, message_p);
+    itti_send_msg_to_task(TASK_PDCP_GTP, CUuniqInstance, message_p);
   } else {
     mem_block_t *memblock = get_free_mem_block(size, __FUNCTION__);
     memcpy(memblock->data, buf, size);

openair3/ocp-gtpu/gtp_itf.cpp

@@ -1306,6 +1306,83 @@ void *gtpv1uTask(void *args)  {
   return NULL;
 }
 
+void *pdcp_gtp_Task(void *args)  {
+  while(1) {
+    /* Trying to fetch a message from the message queue.
+       If the queue is empty, this function will block till a
+       message is sent to the task.
+    */
+    printf("pdcpgtptask\n");
+    MessageDef *message_p = NULL;
+    itti_receive_msg(TASK_PDCP_GTP, &message_p);
+    printf("pdcpgtp收到数据判断前\n");  
+    if (message_p != NULL ) {
+      printf("pdcpgtp收到数据\n");
+      openAddr_t addr= {{0}};
+      const instance_t myInstance = ITTI_MSG_DESTINATION_INSTANCE(message_p);
+      const int msgType = ITTI_MSG_ID(message_p);
+      LOG_D(GTPU, "GTP-U received %s for instance %ld\n", messages_info[msgType].name, myInstance);
+      switch (msgType) {
+          // DATA TO BE SENT TO UDP
+
+        case GTPV1U_TUNNEL_DATA_REQ: {
+          gtpv1uSend(compatInst(myInstance), &GTPV1U_TUNNEL_DATA_REQ(message_p), false, false);
+        }
+        break;
+
+        case GTPV1U_DU_BUFFER_REPORT_REQ:{
+          gtpv1uSendDlDeliveryStatus(compatInst(myInstance), &GTPV1U_DU_BUFFER_REPORT_REQ(message_p));
+        }
+        break;
+
+        case TERMINATE_MESSAGE:
+          break;
+
+        case TIMER_HAS_EXPIRED:
+          LOG_E(GTPU, "Received unexpected timer expired (no need of timers in this version) %s\n", ITTI_MSG_NAME(message_p));
+          break;
+
+        case GTPV1U_ENB_END_MARKER_REQ:
+          gtpv1uEndTunnel(compatInst(myInstance), &GTPV1U_TUNNEL_DATA_REQ(message_p));
+          itti_free(TASK_GTPV1_U, GTPV1U_TUNNEL_DATA_REQ(message_p).buffer);
+          break;
+
+        case GTPV1U_ENB_DATA_FORWARDING_REQ:
+        case GTPV1U_ENB_DATA_FORWARDING_IND:
+        case GTPV1U_ENB_END_MARKER_IND:
+          LOG_E(GTPU, "to be developped %s\n", ITTI_MSG_NAME(message_p));
+          abort();
+          break;
+
+        case GTPV1U_REQ:
+          // to be dev: should be removed, to use API
+          strcpy(addr.originHost, GTPV1U_REQ(message_p).localAddrStr);
+          strcpy(addr.originService, GTPV1U_REQ(message_p).localPortStr);
+          strcpy(addr.destinationService,addr.originService);
+          AssertFatal((legacyInstanceMapping=gtpv1Init(addr))!=0,"Instance 0 reserved for legacy\n");
+          break;
+
+        default:
+          LOG_E(GTPU, "Received unexpected message %s\n", ITTI_MSG_NAME(message_p));
+          abort();
+          break;
+      }
+
+      AssertFatal(EXIT_SUCCESS==itti_free(TASK_GTPV1_U, message_p), "Failed to free memory!\n");
+    }
+
+    struct epoll_event events[20];
+    int nb_events = itti_get_events(TASK_GTPV1_U, events, 20);
+
+    for (int i = 0; i < nb_events; i++)
+      if ((events[i].events&EPOLLIN))
+        gtpv1uReceiver(events[i].data.fd);
+  }
+
+  return NULL;
+}
+
+
 #ifdef __cplusplus
 }
 #endif

openair3/ocp-gtpu/gtp_itf.h

@@ -106,6 +106,7 @@ extern "C" {
   int newGtpuDeleteTunnels(instance_t instance, ue_id_t ue_id, int nbTunnels, pdusessionid_t *pdusession_id);
   instance_t gtpv1Init(openAddr_t context);
   void *gtpv1uTask(void *args);
+  void *pdcp_gtp_Task(void *args);
 
   // Legacy to fix
   typedef struct gtpv1u_data_s {