From a1fc1972e1d4afb244b6622e149ab73706e9e1a8 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Mon, 30 Sep 2024 12:47:22 +0200 Subject: [PATCH] one old bug, one regression --- executables/lte-ue.c | 13 +++++++------ openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 5 +++-- openair2/RRC/LTE/rrc_UE.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/executables/lte-ue.c b/executables/lte-ue.c index 6b77e75c83..8e05aae489 100644 --- a/executables/lte-ue.c +++ b/executables/lte-ue.c @@ -1699,12 +1699,13 @@ void write_dummy(PHY_VARS_UE *UE, openair0_timestamp timestamp) { for ( int i=0; i < UE->frame_parms.nb_antennas_tx; i++) samplesVoid[i]=(void *)&v; - AssertFatal( 1 == UE->rfdevice.trx_write_func(&UE->rfdevice, - timestamp+2*UE->frame_parms.samples_per_tti, - samplesVoid, - 1, - UE->frame_parms.nb_antennas_tx, - 1),""); + int written = UE->rfdevice.trx_write_func(&UE->rfdevice, + timestamp + 2 * UE->frame_parms.samples_per_tti, + samplesVoid, + 1, + UE->frame_parms.nb_antennas_tx, + TX_BURST_START_AND_END); + AssertFatal(1 == written, "write to SDR failed\n"); } void *UE_thread(void *arg) { diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c index c63487e1ce..c4a894095a 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c @@ -557,6 +557,9 @@ bool pdcp_data_req(protocol_ctxt_t *ctxt_pP, break; } + if (pdcp_uid == MAX_MOBILES_PER_ENB) + return ret; + LOG_D(PDCP,"ueid %d lcid %d tx seq num %d\n", pdcp_uid, (int)(rb_idP+rb_offset), current_sn); Pdcp_stats_tx[ctxt_pP->module_id][pdcp_uid][rb_idP+rb_offset]++; Pdcp_stats_tx_tmp_w[ctxt_pP->module_id][pdcp_uid][rb_idP+rb_offset]++; @@ -2298,8 +2301,6 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) { if (UE_NAS_USE_TUN) { int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) ? MAX_MOBILES_PER_ENB : 1; tun_init("oaitun_ue", num_if, id); - if (IS_SOFTMODEM_NOS1) - tun_config(1, "10.0.1.2", NULL, "oaitun_ue"); tun_init_mbms("oaitun_uem", id + 1); tun_config(1, "10.0.2.2", NULL, "oaitun_uem"); LOG_I(PDCP, "UE pdcp will use tun interface\n"); diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c index 13787f2334..07b27310a5 100644 --- a/openair2/RRC/LTE/rrc_UE.c +++ b/openair2/RRC/LTE/rrc_UE.c @@ -771,7 +771,7 @@ rrc_ue_establish_drb( "10.0.%d.%d", UE_NAS_USE_TUN ? 1 : (ip_addr_offset3 + ue_mod_idP + 1), ip_addr_offset4 + ue_mod_idP + 1); - oip_ifup = tun_config(ip_addr_offset3 + ue_mod_idP + 1, ip, NULL, "oaitun_oip"); + oip_ifup = tun_config(ip_addr_offset3 + ue_mod_idP + 1, ip, NULL, "oaitun_ue"); if (oip_ifup == 0 && (!UE_NAS_USE_TUN)) { // interface is up --> send a config the DRB LOG_I(OIP,"[UE %d] Config the ue net interface %d to send/receive pkt on DRB %ld to/from the protocol stack\n",