Base skeleton and comments of where socket needs to be implemented

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -203,9 +203,9 @@ eNBs =
 MACRLCs = (
 	{
 	num_cc = 1;
-	local_s_if_name  = "ens3";
+	local_s_if_name  = "lo";
-	remote_s_address = "CI_UE_IP_ADDR";
+	remote_s_address = "127.0.0.1";
-	local_s_address  = "CI_ENB_IP_ADDR";
+	local_s_address  = "127.0.0.1";
 	local_s_portc    = 50001;
 	remote_s_portc   = 50000;
 	local_s_portd    = 50011;

ci-scripts/conf_files/ue.nfapi.conf

@@ -20,9 +20,9 @@ L1s = (
         {
 	num_cc = 1;
 	tr_n_preference = "nfapi";
-	local_n_if_name  = "ens3";
+	local_n_if_name  = "lo";
-	remote_n_address = "CI_ENB_IP_ADDR";
+	remote_n_address = "127.0.0.1";
-	local_n_address  = "CI_UE_IP_ADDR";
+	local_n_address  = "127.0.0.1";
 	local_n_portc    = 50000;
 	remote_n_portc   = 50001;
 	local_n_portd    = 50010;

cmake_targets/no_epc.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo -E ./ran_build/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf --nos1

nfapi/oai_integration/vendor_ext.h

@@ -70,7 +70,8 @@ typedef enum {
   NFAPI_MODE_VNF,
   NFAPI_UE_STUB_PNF,
   NFAPI_UE_STUB_OFFNET,
-  NFAPI_MODE_UNKNOWN
+  NFAPI_MODE_UNKNOWN,
+  NFAPI_MODE_STANDALONE_PNF
 } nfapi_mode_t;
 
 char *nfapi_get_strmode(void);

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -1044,6 +1044,11 @@ void UE_config_stub_pnf(void) {
   }
 }
 
+void UE_init_socket(void) {
+
+  // scpt socket creation and memcpy function calls here
+}
+
 /* Dummy functions*/
 
 void handle_nfapi_hi_dci0_dci_pdu(

targets/RT/USER/lte-ue.c

@@ -413,12 +413,12 @@ void init_UE_stub_single_thread(int nb_inst,
     // PHY_vars_UE_g[inst][0] = init_ue_vars(NULL,inst,0);
   }
 
-  init_timer_thread();
+  init_timer_thread(); // dont need this
   init_UE_single_thread_stub(nb_inst);
   printf("UE threads created \n");
   LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
 
-  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF)
+  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) // dont need this
     multicast_link_start(ue_stub_rx_handler,0,emul_iface);
 }
 

targets/RT/USER/lte-uesoftmodem.c

@@ -631,7 +631,7 @@ int main( int argc, char **argv ) {
 
   NB_INST=1;
 
-  if(NFAPI_MODE==NFAPI_UE_STUB_PNF) {
+  if(NFAPI_MODE==NFAPI_UE_STUB_PNF) { // || NFAPI_MODE_STANDALONE_PNF
     PHY_vars_UE_g = malloc(sizeof(PHY_VARS_UE **)*NB_UE_INST);
 
     for (int i=0; i<NB_UE_INST; i++) {
@@ -652,10 +652,10 @@ int main( int argc, char **argv ) {
   }
 
   cpuf=get_cpu_freq_GHz();
-  
+
-  
+
 #if 0 // #ifndef DEADLINE_SCHEDULER
-  
+
   printf("NO deadline scheduler\n");
   /* Currently we set affinity for UHD to CPU 0 for eNB/UE and only if number of CPUS >2 */
   cpu_set_t cpuset;
@@ -667,7 +667,7 @@ int main( int argc, char **argv ) {
   if (get_nprocs() > 2) {
     for (j = 2; j < get_nprocs(); j++)
       CPU_SET(j, &cpuset);
-    
+
     s = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
 
     if (s != 0) {
@@ -708,6 +708,8 @@ int main( int argc, char **argv ) {
     UE_config_stub_pnf();
   }
 
+  // add socket here and call corresponding memcpys - Andrew
+
   printf("ITTI tasks created\n");
   mlockall(MCL_CURRENT | MCL_FUTURE);
   rt_sleep_ns(10*100000000ULL);
@@ -719,7 +721,18 @@ int main( int argc, char **argv ) {
     //Panos: Temporarily we will be using single set of threads for multiple UEs.
     //init_UE_stub(1,eMBMS_active,uecap_xer_in,emul_iface);
     init_UE_stub_single_thread(NB_UE_INST,eMBMS_active,uecap_xer_in,emul_iface);
-  } else {
+  } else if (NFAPI_MODE==NFAPI_MODE_STANDALONE_PNF) {
+    // init thread and open socket
+
+    /*
+    need to do this in thread
+     l2_init_ue(eMBMS_active,(uecap_xer_in==1)?uecap_xer:NULL,
+             0,// cba_group_active
+             0); // HO flag
+    */
+
+  }
+  else {
     init_UE(NB_UE_INST,eMBMS_active,uecap_xer_in,0,get_softmodem_params()->phy_test,UE_scan,UE_scan_carrier,mode,(int)rx_gain[0][0],tx_max_power[0],
             frame_parms[0]);
   }