nr-ip-over-lte :Enable TUN interface at nrUE and required (LTE-based) PDCP,...

nr-ip-over-lte :Enable TUN interface at nrUE and required (LTE-based) PDCP, RLC configuration for DL IP traffic flow. Traffic received at the UE TUN IP interface successfully now.

executables/nr-ue.c

@@ -383,7 +383,12 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
 #endif
   }
 
-  
+  //Hardcoded rnti value
+  protocol_ctxt_t ctxt;
+  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO,
+                                   0x1234, proc->frame_rx,
+                                   proc->nr_tti_rx, 0);
+  pdcp_run(&ctxt);
   // no UL for now
   /*
   if (UE->mac_enabled==1) {

executables/nr-uesoftmodem.c

@@ -405,6 +405,8 @@ static void get_options(void) {
   uint32_t online_log_messages;
   uint32_t glog_level, glog_verbosity;
   uint32_t start_telnetsrv=0;
+  uint32_t noS1;
+  uint32_t nokrnmod;
   paramdef_t cmdline_params[] =CMDLINE_PARAMS_DESC_UE ;
   paramdef_t cmdline_logparams[] =CMDLINE_LOGPARAMS_DESC_NR ;
   config_process_cmdline( cmdline_params,sizeof(cmdline_params)/sizeof(paramdef_t),NULL);
@@ -669,6 +671,26 @@ void init_openair0(void) {
   }
 }
 
+void init_pdcp(void) {
+  uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
+
+  /*if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
+    pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+  }*/
+
+  if (IS_SOFTMODEM_NOKRNMOD)
+    pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+
+  if (rlc_module_init() != 0) {
+	  LOG_I(RLC, "Problem at RLC initiation \n");
+  }
+  pdcp_layer_init();
+  pdcp_module_init(pdcp_initmask);
+  pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
+  pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
+  LOG_I(PDCP, "Before getting out from init_pdcp() \n");
+}
+
 
 int main( int argc, char **argv ) {
   //uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
@@ -688,6 +710,7 @@ int main( int argc, char **argv ) {
   logInit();
   // get options and fill parameters from configuration file
   get_options (); //Command-line options, enb_properties
+  get_common_options();
 #if T_TRACER
   T_Config_Init();
 #endif
@@ -704,14 +727,18 @@ int main( int argc, char **argv ) {
     if (init_opt() == -1)
       LOG_E(OPT,"failed to run OPT \n");
   }
+  //Add --nr-ip-over-lte option check here
+  init_pdcp();
 
+  /*
 #ifdef PDCP_USE_NETLINK
   netlink_init();
 #if defined(PDCP_USE_NETLINK_QUEUES)
   pdcp_netlink_init();
 #endif
 #endif
-#ifndef PACKAGE_VERSION
+*/
+  #ifndef PACKAGE_VERSION
 #  define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
 #endif
   LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -2173,6 +2173,8 @@ 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
+      nas_config(1, 1, 2, "ue");
       LOG_I(PDCP, "UE pdcp will use tun interface\n");
     } else if(ENB_NAS_USE_TUN) {
       netlink_init_tun("enb",1);
@@ -2382,7 +2384,13 @@ void pdcp_layer_init(void)
 
   ASN_SEQUENCE_ADD(&DRB_configList->list,DRB_config);
 
-  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_YES, 0x1234, 0, 0,0);
+  if (ENB_NAS_USE_TUN){
+	  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_YES, 0x1234, 0, 0,0);
+  }
+  else{
+	  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, 0x1234, 0, 0,0);
+  }
+
   rrc_pdcp_config_asn1_req(&ctxt,
                (LTE_SRB_ToAddModList_t *) NULL,
                DRB_configList,

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -111,7 +111,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const  ctxt_pP) {
   int              ret=0;
 
   while ((sdu_p = list_get_head (&pdcp_sdu_list)) != NULL && ((pdcp_data_ind_header_t *)(sdu_p->data))->inst == ctxt_pP->module_id) {
-    ((pdcp_data_ind_header_t *)(sdu_p->data))->inst = 0;
+	  ((pdcp_data_ind_header_t *)(sdu_p->data))->inst = 0;
     int rb_id = ((pdcp_data_ind_header_t *)(sdu_p->data))->rb_id;
     int sizeToWrite= sizeof (pdcp_data_ind_header_t) +
                      ((pdcp_data_ind_header_t *) sdu_p->data)->data_size;