diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index 0a638f72655a2a6634b6d073e3c5ad61bd7fbe08..62383b6dc92fb82dd00686a457835374f3a2907b 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -910,6 +910,7 @@ init_opt();
#ifdef PDCP_USE_NETLINK
+if(!IS_SOFTMODEM_NOS1)
netlink_init();
#if defined(PDCP_USE_NETLINK_QUEUES)
pdcp_netlink_init();
diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index 24288d76d38fe476325e77a886ea0d9b8a261ff2..fde6e243989382e415929ba1fbb65e4d2e16d92c 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -420,7 +420,6 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
0x1234, proc->frame_rx,
proc->nr_tti_rx, 0);
pdcp_run(&ctxt);
- pdcp_fifo_flush_sdus(&ctxt);
}
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
index 1d3e62714b492f08b4f8a8f0420a1bf923c7379f..4a90523fd11adf45c06f340bb1abf39afa6d2ae9 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
@@ -593,16 +593,16 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
p_procTime);
if (check_crc((uint8_t*)llrProcBuf,length_dec,harq_process->F,crc_type)) {
- //#ifdef PRINT_CRC_CHECK
+ #ifdef PRINT_CRC_CHECK
//if (prnt_crc_cnt % 10 == 0)
LOG_I(PHY, "Segment %d CRC OK\n",r);
- //#endif
+ #endif
ret = no_iteration_ldpc;
} else {
- //#ifdef PRINT_CRC_CHECK
+ #ifdef PRINT_CRC_CHECK
//if (prnt_crc_cnt%10 == 0)
LOG_I(PHY, "CRC NOK\n");
- //#endif
+ #endif
ret = ulsch->max_ldpc_iterations + 1;
}
@@ -719,12 +719,14 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
}
- LOG_I(PHY, "output encoder: \n");
+#ifdef DEBUG_ULSCH_DECODING
+ LOG_I(PHY, "Decoder output (payload): \n");
for (i = 0; i < harq_process->TBS / 8; i++) {
//harq_process_ul_ue->a[i] = (unsigned char) rand();
//printf("a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
printf("0x%02x",harq_process->b[i]);
}
+#endif
ulsch->last_iteration_cnt = ret;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index a5c747bbbae2ad65f7fd349ac7d9fca6d1a4c1a0..fd0eb3f996eb86d28934de7ab467f6e04c21b1ce 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -45,6 +45,7 @@
//#define DEBUG_SCFDMA
//#define DEBUG_PUSCH_MAPPING
+#define DEBUG_MAC_PDU
//extern int32_t uplink_counter;
@@ -160,13 +161,25 @@ uint8_t nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
if(data_existing){
//harq_process_ul_ue->a = (unsigned char*)calloc(harq_process_ul_ue->TBS/8, sizeof(unsigned char));
memcpy(harq_process_ul_ue->a, ulsch_input_buffer, harq_process_ul_ue->TBS/8);
- LOG_I(PHY, "input encoder: \n");
+
+ #ifdef DEBUG_MAC_PDU
+ LOG_I(PHY, "Printing MAC PDU to be encoded: \n");
+ for (i = 0; i < harq_process_ul_ue->TBS / 8; i++) {
+ printf("0x%02x",harq_process_ul_ue->a[i]);
+ }
+ printf("\n");
+ #endif
+ }
+ else{
+ //Use different rnti for the random (non-IP traffic) in noS1 mode, in order to use it as a filter
+ //to block this traffic from being forwarded to the MAC layer of the gNB
+ ulsch_ue->rnti = 0x1111;
+ LOG_E(PHY, "Random data to be tranmsitted: \n");
for (i = 0; i < harq_process_ul_ue->TBS / 8; i++) {
- //harq_process_ul_ue->a[i] = (unsigned char) rand();
- //printf("a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
- //printf("0x%02x",harq_process_ul_ue->a[i]);
- printf("0x%02x",harq_process_ul_ue->b[i]);
- }
+ harq_process_ul_ue->a[i] = (unsigned char) rand();
+ //printf(" input encoder a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
+ }
+ data_existing = 1;
}
}
//else if(uplink_counter == 0){ //if(!IS_SOFTMODEM_NOS1){
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index a849e3c2d9b734d68dd5fc47993bf0e71d22102d..7f43c02fcb60e0593729c9cddf023f86438d39a6 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -38,6 +38,7 @@
#include "PHY/INIT/phy_init.h"
#include "PHY/MODULATION/nr_modulation.h"
#include "T.h"
+#include "executables/nr-softmodem.h"
#include "assertions.h"
#include "msc.h"
@@ -261,10 +262,12 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
if (ret > gNB->ulsch[UE_id][0]->max_ldpc_iterations)
LOG_I(PHY, "ULSCH in error\n");
//gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->b
- else if(gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->b!=NULL){
- LOG_I(PHY, "ULSCH received ok, number of iterations: %d \n", ret);
- nr_fill_crc_indication (gNB, UE_id, frame_rx, slot_rx, 0);
- nr_fill_rx_indication(gNB, frame_rx, slot_rx, UE_id, harq_pid);
+ else if(gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->b!=NULL){
+ LOG_D(PHY, "ULSCH received ok \n");
+ if(IS_SOFTMODEM_NOS1 && gNB->ulsch[UE_id][0]->rnti == 0x1234){
+ nr_fill_crc_indication (gNB, UE_id, frame_rx, slot_rx, 0);
+ nr_fill_rx_indication(gNB, frame_rx, slot_rx, UE_id, harq_pid);
+ }
}
}
@@ -295,7 +298,6 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
pdu->rx_ue_information.tl.tag = NFAPI_RX_UE_INFORMATION_TAG;
pdu->rx_ue_information.rnti = gNB->ulsch[UE_id][0]->rnti;
pdu->rx_indication_rel8.tl.tag = NFAPI_RX_INDICATION_REL8_TAG;
- pdu->rx_indication_rel8.length = gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->TBS>>3;
pdu->rx_indication_rel8.offset = 1; // DJP - I dont understand - but broken unless 1 ???? 0; // filled in at the end of the UL_INFO formation
pdu->data = harq_process->b;//gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->b;
// estimate timing advance for MAC
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index c0c8a9ec24da25ee925d2f5e7d544c89ea08ec60..11bb2ee69fef4a8964e29a113664c30d4e80e699 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -3028,6 +3028,16 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
(char) (taus() & 0xff);
}
}
+#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+ LOG_D(MAC, "Printing UL MAC payload without the header UE side: \n");
+ for (int i = payload_offset; i < sdu_length_total ; i++) {
+ //harq_process_ul_ue->a[i] = (unsigned char) rand();
+ //printf("a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
+ printf("%02x ",(unsigned char)ulsch_buffer[i]);
+ }
+ printf("\n");
+#endif
+
return 1;
}
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index f0a854514129e7dc80d96a7d08a3c746758ee3e6..d9e6b0d58395561a7e1283ec365278386172df8b 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -634,7 +634,7 @@ nr_rx_sdu(const module_id_t enb_mod_idP,
} // end for loop on control element
for (int i = 0; i < num_sdu; i++) {
- LOG_I(MAC, "SDU Number %d MAC Subheader SDU_LCID %d, length %d\n",
+ LOG_D(MAC, "SDU Number %d MAC Subheader SDU_LCID %d, length %d\n",
i,
rx_lcids[i],
rx_lengths[i]);
@@ -701,9 +701,16 @@ nr_rx_sdu(const module_id_t enb_mod_idP,
if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0)) { // MAX SIZE OF transport block
- mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL);
+#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+ LOG_I(MAC, "Printing UL MAC payload after removing the header: \n");
+ for (int j = 0; j < rx_lengths[i] ; j++) {
+ printf("%02x ",(unsigned char) *(payload_ptr+j));
+ }
+ pritnf("\n");
+#endif
+ mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr+1, rx_lengths[i], 1, NULL);
} else { /* rx_length[i] Max size */
- UE_list->eNB_UE_stats[CC_idP][UE_id].num_errors_rx += 1;
+ //UE_list->eNB_UE_stats[CC_idP][UE_id].num_errors_rx += 1;
LOG_E(MAC, "[eNB %d] CC_id %d Frame %d : Max size of transport block reached LCID %d from UE %d ",
enb_mod_idP,
CC_idP,
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index f234e02c04b7086ca6e81c9552bbd00aeb47410d..c2ebf8d1ea7065d0a9e4e4ec83f13b04ef8923cd 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -2171,7 +2171,6 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask ) {
if(UE_NAS_USE_TUN) {
int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 )?MAX_NUMBER_NETIF:1;
netlink_init_tun("ue",num_if);
- //Add --nr-ip-over-lte option check for next line
if (IS_SOFTMODEM_NOS1)
nas_config(1, 1, 2, "ue");
LOG_I(PDCP, "UE pdcp will use tun interface\n");
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index 260e7c3ba3185faca64f53bf03f51fd72bbe3083..8a87dad1bee2a2f3c9cffa9c741f6b0834c5e495 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -124,18 +124,34 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
ret = sendto(pdcp_pc5_sockfd, &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),
sizeof(sidelink_pc5s_element), 0, (struct sockaddr *)&prose_pdcp_addr,sizeof(prose_pdcp_addr) );
+
} else if (UE_NAS_USE_TUN) {
- ret = write(nas_sock_fd[ctxt_pP->module_id], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
+ #if defined(ENABLE_PDCP_PAYLOAD_DEBUG)
+ LOG_I(PHY, "PDCP output to be sent to TUN interface: \n");
+ for (int i = sizeof(pdcp_data_ind_header_t); i < sizeToWrite; i++) {
+ printf("%02x ",(unsigned char)sdu_p->data[i]);
+ }
+ printf("\n");
+ #endif
+ ret = write(nas_sock_fd[ctxt_pP->module_id], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
+
} else if (ENB_NAS_USE_TUN) {
- ret = write(nas_sock_fd[0], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
- LOG_I(PDCP, "ENB_NAS_USE_TUN is enabled, ret: %d, ctxt_pP->module_id:%d, sizeToWrite:%d, header size:%d \n", ctxt_pP->module_id, ret, sizeToWrite, sizeof (pdcp_data_ind_header_t));
+ #if defined(ENABLE_PDCP_PAYLOAD_DEBUG)
+ LOG_I(PHY, "PDCP output to be sent to TUN interface: \n");
+ for (int i = sizeof(pdcp_data_ind_header_t); i < sizeToWrite; i++) {
+ printf("%02x ",(unsigned char)sdu_p->data[i]);
+ }
+ printf("\n");
+ #endif
+ ret = write(nas_sock_fd[0], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]), sizeToWrite);
+
} else if (PDCP_USE_NETLINK) {
memcpy(NLMSG_DATA(nas_nlh_tx), (uint8_t *) sdu_p->data, sizeToWrite);
nas_nlh_tx->nlmsg_len = sizeToWrite;
ret = sendmsg(nas_sock_fd[0],&nas_msg_tx,0);
} // PDCP_USE_NETLINK
- AssertFatal(ret >= 0,"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s)\n", errno, strerror(errno));
+ AssertFatal(ret >= 0,"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s), nas_sock_fd[0]: %d\n", errno, strerror(errno), nas_sock_fd[0]);
#if defined(ENABLE_PDCP_PAYLOAD_DEBUG)
LOG_I(PDCP, "Printing first bytes of PDCP SDU before removing it from the list: \n");
@@ -187,6 +203,15 @@ int pdcp_fifo_read_input_sdus_fromtun (const protocol_ctxt_t *const ctxt_pP) {
LOG_D(PDCP, "[FRAME %5u][UE][IP][INSTANCE %u][RB %ld][--- PDCP_DATA_REQ / %d Bytes --->][PDCP][MOD %u][UE %04x][RB %ld]\n",
ctxt.frame, ctxt.instance, rab_id, len, ctxt.module_id,
ctxt.rnti, rab_id);
+
+#if defined ENABLE_PDCP_PAYLOAD_DEBUG
+ LOG_I(PHY, "TUN interface output received from PDCP: \n");
+ for (int i = 0; i < 128; i++) {
+ printf("%02x ",(unsigned char)nl_rx_buf[i]);
+ }
+ printf("\n");
+#endif
+
pdcp_data_req(&ctxt, SRB_FLAG_NO, rab_id, RLC_MUI_UNDEFINED,
RLC_SDU_CONFIRM_NO, len, (unsigned char *)nl_rx_buf,
PDCP_TRANSMISSION_MODE_DATA
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index 35b2980d41af9005bb2bcaa82b38800a33563190..67931f22a956f2aba8271df81caa5207f85a249d 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -81,7 +81,7 @@ void mac_rlc_data_ind (
} else {
LOG_E(RLC, "%s:%d:%s: fatal: no RB found (channel ID %d)\n",
__FILE__, __LINE__, __FUNCTION__, channel_idP);
- //exit(1);
+ exit(1);
}
nr_rlc_manager_unlock(nr_rlc_ue_manager);
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index 94aa458b96e12132a1b8c8ef6a4e7d4b67f9b5a9..2094b3517e40e3c887542227ecc430b262f90669 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -192,7 +192,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info) {
UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.timing_advance,
UL_info->rx_ind.rx_indication_body.rx_pdu_list[i].rx_indication_rel8.ul_cqi);
} else {
- LOG_I(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC ok) \n",UL_info->frame,UL_info->slot);
+ LOG_D(MAC,"Frame %d, Slot %d Calling rx_sdu (CRC ok) \n",UL_info->frame,UL_info->slot);
nr_rx_sdu(UL_info->module_id,
UL_info->CC_id,
NFAPI_SFNSF2SFN(UL_info->rx_ind.sfn_sf), //UL_info->frame,