On-net UE and basic multicast/unicast D2D scenarios are now functional.

openair1/SCHED/phy_procedures_lte_ue.c

@@ -2348,7 +2348,9 @@ void phy_procedures_UE_SL_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc) {
   if ((slss = ue_get_slss(ue->Mod_id,ue->CC_id,frame_tx,subframe_tx)) != NULL) generate_slss(ue,slss,frame_tx,subframe_tx);
 
   // check for SLDCH
-  if ((sldch = ue_get_sldch(ue->Mod_id,ue->CC_id,frame_tx,subframe_tx)) != NULL) generate_sldch(ue,sldch,frame_tx,subframe_tx);
+  // Panos: Temporarily out for the On-net scenario as there is some implication with the traffic targeting the network
+  // and is treated as SL discovery instead.
+  //if ((sldch = ue_get_sldch(ue->Mod_id,ue->CC_id,frame_tx,subframe_tx)) != NULL) generate_sldch(ue,sldch,frame_tx,subframe_tx);
 
   // check for SLSCH
   if ((slsch = ue_get_slsch(ue->Mod_id,ue->CC_id,frame_tx,subframe_tx)) != NULL) generate_slsch(ue,slsch,frame_tx,subframe_tx);

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -440,6 +440,7 @@ pdcp_data_ind(
 )
 //-----------------------------------------------------------------------------
 {
+	//LOG_I(RLC, "Panos-D: pdcp_data_ind() 1 \n");
   pdcp_t      *pdcp_p          = NULL;
   list_t      *sdu_list_p      = NULL;
   mem_block_t *new_sdu_p       = NULL;
@@ -812,7 +813,7 @@ pdcp_data_ind(
   }
 
   /* Print octets of incoming data in hexadecimal form */
-  LOG_D(PDCP, "Following content has been received from RLC (%d,%d)(PDCP header has already been removed):\n",
+  LOG_I(PDCP, "Following content has been received from RLC (%d,%d)(PDCP header has already been removed):\n",
 	sdu_buffer_sizeP  - payload_offset + (int)sizeof(pdcp_data_ind_header_t),
 	sdu_buffer_sizeP  - payload_offset);
   //util_print_hex_octets(PDCP, &new_sdu_p->data[sizeof (pdcp_data_ind_header_t)], sdu_buffer_sizeP - payload_offset);

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -195,7 +195,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
 
 #endif /* defined(ENABLE_USE_MME) */
 #ifdef PDCP_DEBUG
-      LOG_D(PDCP, "PDCP->IP TTI %d INST %d: Preparing %d Bytes of data from rab %d to Nas_mesh\n",
+      LOG_I(PDCP, "PDCP->IP TTI %d INST %d: Preparing %d Bytes of data from rab %d to Nas_mesh\n",
             ctxt_pP->frame, ((pdcp_data_ind_header_t *)(sdu_p->data))->inst,
             ((pdcp_data_ind_header_t *)(sdu_p->data))->data_size, ((pdcp_data_ind_header_t *)(sdu_p->data))->rb_id);
 #endif //PDCP_DEBUG
@@ -237,6 +237,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
          if (!pdcp_output_header_bytes_to_write) {
             pdcp_output_header_bytes_to_write = sizeof (pdcp_data_ind_header_t);
          }
+         //LOG_I(PDCP, "Panos-D: pdcp_fifo_flush_sdus() in PDCP_USE_NETLINK 0 \n");
 
 #ifdef PDCP_USE_RT_FIFO
          bytes_wrote = rtf_put (PDCP2PDCP_USE_RT_FIFO,
@@ -245,7 +246,9 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
 
 #else
 #ifdef PDCP_USE_NETLINK
+         //LOG_I(PDCP, "Panos-D: pdcp_fifo_flush_sdus() in PDCP_USE_NETLINK 0.1 \n");
 #ifdef LINUX
+         //LOG_I(PDCP, "Panos-D: pdcp_fifo_flush_sdus() in PDCP_USE_NETLINK 1 \n");
          memcpy(NLMSG_DATA(nas_nlh_tx), &(((uint8_t *) sdu_p->data)[sizeof (pdcp_data_ind_header_t) - pdcp_output_header_bytes_to_write]),
                pdcp_output_header_bytes_to_write);
          nas_nlh_tx->nlmsg_len = pdcp_output_header_bytes_to_write;
@@ -255,6 +258,9 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
          bytes_wrote = pdcp_output_header_bytes_to_write;
 #endif //PDCP_USE_RT_FIFO
 
+         LOG_I(PDCP, "Frame %d Sent %d Bytes of header to Nas_mesh\n",
+                        ctxt_pP->frame,
+                        bytes_wrote);
 #ifdef PDCP_DEBUG
          LOG_D(PDCP, "Frame %d Sent %d Bytes of header to Nas_mesh\n",
                ctxt_pP->frame,
@@ -274,6 +280,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
 
 #ifdef PDCP_USE_NETLINK
 #ifdef LINUX
+              // LOG_I(PDCP, "Panos-D: pdcp_fifo_flush_sdus() in PDCP_USE_NETLINK 2 \n");
           memcpy(NLMSG_DATA(nas_nlh_tx)+sizeof(pdcp_data_ind_header_t), &(sdu_p->data[sizeof (pdcp_data_ind_header_t)]), pdcp_output_sdu_bytes_to_write);
           nas_nlh_tx->nlmsg_len += pdcp_output_sdu_bytes_to_write;
           VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_UE_PDCP_FLUSH_SIZE, pdcp_output_sdu_bytes_to_write);
@@ -317,7 +324,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
 #endif // PDCP_USE_RT_FIFO
 
 #ifdef PDCP_DEBUG
-               LOG_D(PDCP, "PDCP->IP Frame %d INST %d: Sent %d Bytes of data from rab %d to higher layers\n",
+               LOG_I(PDCP, "PDCP->IP Frame %d INST %d: Sent %d Bytes of data from rab %d to higher layers\n",
                      ctxt_pP->frame,
                      ((pdcp_data_ind_header_t *)(sdu_p->data))->inst,
                      bytes_wrote,
@@ -329,7 +336,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const  ctxt_pP)
 
                   if (!pdcp_output_sdu_bytes_to_write) { // OK finish with this SDU
                      // LOG_D(PDCP, "rb sent a sdu qos_sap %d\n", sapiP);
-                     LOG_D(PDCP,
+                     LOG_I(PDCP,
                            "[FRAME %05d][xxx][PDCP][MOD xx/xx][RB %u][--- PDCP_DATA_IND / %d Bytes --->][IP][INSTANCE %u][RB %u]\n",
                            ctxt_pP->frame,
                            ((pdcp_data_ind_header_t *)(sdu_p->data))->rb_id,

openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c

@@ -221,6 +221,9 @@ rlc_um_try_reassembly(
   int                 i                      = 0;
   int                 reassembly_start_index = 0;
 
+
+  //LOG_I(RLC, "Panos-D: rlc_um_try_reassembly() 1 \n");
+
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RLC_UM_TRY_REASSEMBLY,VCD_FUNCTION_IN);
 
   if (end_snP < 0)   {

openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_reassembly.c

@@ -107,6 +107,7 @@ rlc_um_reassembly (const protocol_ctxt_t* const ctxt_pP, rlc_um_entity_t *rlc_pP
 void
 rlc_um_send_sdu (const protocol_ctxt_t* const ctxt_pP, rlc_um_entity_t *rlc_pP)
 {
+	//LOG_I(RLC, "Panos-D: rlc_um_send_sdu 1 \n");
   if ((rlc_pP->output_sdu_in_construction)) {
     LOG_D(RLC, PROTOCOL_RLC_UM_CTXT_FMT" SEND_SDU to upper layers %d bytes sdu %p\n",
           PROTOCOL_RLC_UM_CTXT_ARGS(ctxt_pP,rlc_pP),

openair2/LAYER2/RLC/rlc.c

@@ -564,6 +564,7 @@ void rlc_data_ind     (
   const sdu_size_t  sdu_sizeP,
   mem_block_t      *sdu_pP)
 {
+	//LOG_I(RLC, "Panos-D: rlc_data_ind() 1 \n");
   //-----------------------------------------------------------------------------