save commit

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -168,10 +168,48 @@ void pdcp_layer_init(void)
   init_nr_rlc_data_req_queue();
 }
 
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "targets/RT/USER/lte-softmodem.h"
+#include "openair2/RRC/NAS/nas_config.h"
+
 uint64_t pdcp_module_init(uint64_t _pdcp_optmask)
 {
+#if 0
   pdcp_optmask = _pdcp_optmask;
   return pdcp_optmask;
+#endif
+  /* temporary enforce netlink when UE_NAS_USE_TUN is set,
+     this is while switching from noS1 as build option
+     to noS1 as config option                               */
+  if ( _pdcp_optmask & UE_NAS_USE_TUN_BIT) {
+    pdcp_optmask = pdcp_optmask | PDCP_USE_NETLINK_BIT ;
+  }
+
+  pdcp_optmask = pdcp_optmask | _pdcp_optmask ;
+  LOG_I(PDCP, "pdcp init,%s %s\n",
+        ((LINK_ENB_PDCP_TO_GTPV1U)?"usegtp":""),
+        ((PDCP_USE_NETLINK)?"usenetlink":""));
+
+  if (PDCP_USE_NETLINK) {
+    nas_getparams();
+
+    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");
+    } else if(ENB_NAS_USE_TUN) {
+      netlink_init_tun("enb",1);
+      nas_config(1, 1, 1, "enb");
+      LOG_I(PDCP, "ENB pdcp will use tun interface\n");
+    } else {
+      LOG_I(PDCP, "pdcp will use kernel modules\n");
+      netlink_init();
+    }
+  }
+  return pdcp_optmask ;
 }
 
 static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,