Fixed broken UL for data plane split

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -368,16 +368,10 @@ boolean_t pdcp_data_req(
 #endif
 
   
-  //starting async
-//   const Enb_properties_array_t   *enb_properties_p  = NULL;
-   Enb_properties_array_t *enb_properties_p  = NULL;
-//   enb_properties_p = malloc(sizeof(Enb_properties_array_t));
-//   memset(enb_properties_p, 0, sizeof(Enb_properties_array_t));
-//   printf("starting the client\n\n");
 
-//   printf("Starting the async client\n");
-//   new_thread(proto_server_start, NULL);
-   enb_properties_p = enb_config_get();
+  Enb_properties_array_t *enb_properties_p  = NULL;
+
+  enb_properties_p = enb_config_get();
 
   static int agent_started = 1;
 
@@ -407,6 +401,7 @@ boolean_t pdcp_data_req(
   }
   else
   {
+    // It should never get here
     rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p);
   }
   }

openair2/LAYER2/PROTO_AGENT/proto_agent_common.c

@@ -437,7 +437,7 @@ int proto_agent_pdcp_data_ind(mid_t mod_id, const void *params, Protocol__Flexsp
   
   printf("MSG payload is %u", args->sdu_size);
   
-  //memcpy(pdu->fsp_pdu_data.data, args->sdu_p, args->sdu_size); 
+  memcpy(pdu->fsp_pdu_data.data, args->sdu_p, args->sdu_size); 
   pdu->has_fsp_pdu_data = 1;
   
   // Copy data to the ctxt structure

openair2/LAYER2/RLC/rlc.c

@@ -653,25 +653,25 @@ void rlc_data_ind     (
     T(T_ENB_RLC_UL, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->rnti), T_INT(rb_idP), T_INT(sdu_sizeP));
 #endif
 
-  if (!srb_flagP)
-  {
+//   if (!srb_flagP)
+//   {
     proto_agent_send_pdcp_data_ind(ctxt_pP,
     srb_flagP,
     MBMS_flagP,
     rb_idP,
     sdu_sizeP,
     sdu_pP);
-  }
-  else
-  {
-    pdcp_data_ind (
-    ctxt_pP,
-    srb_flagP,
-    MBMS_flagP,
-    rb_idP,
-    sdu_sizeP,
-    sdu_pP);
-  }
+//   }
+//   else
+//   {
+//     pdcp_data_ind (
+//     ctxt_pP,
+//     srb_flagP,
+//     MBMS_flagP,
+//     rb_idP,
+//     sdu_sizeP,
+//     sdu_pP);
+//   }
 }
 //-----------------------------------------------------------------------------
 void rlc_data_conf     (const protocol_ctxt_t* const ctxt_pP,