Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge

cmake_targets/CMakeLists.txt

@@ -1716,7 +1716,7 @@ add_library(L2_NR
   ${MAC_NR_SRC}
   ${GNB_APP_SRC}
   )
-add_dependencies(S1AP_LIB nr_rrc_flag s1ap_flag)
+add_dependencies(L2_NR rrc_flag nr_rrc_flag s1ap_flag x2_flag)
 
 add_library(L2_UE
   ${L2_SRC_UE}

executables/nr-softmodem.c

@@ -509,7 +509,6 @@ static void get_options(void) {
   uint32_t online_log_messages;
   uint32_t glog_level, glog_verbosity;
   uint32_t start_telnetsrv;
-  char *in_ip=NULL, *in_path=NULL;
   paramdef_t cmdline_params[] = CMDLINE_PARAMS_DESC_GNB ;
   paramdef_t cmdline_logparams[] = CMDLINE_LOGPARAMS_DESC ;
   config_process_cmdline( cmdline_params,sizeof(cmdline_params)/sizeof(paramdef_t),NULL);

executables/nr-uesoftmodem.c

@@ -403,7 +403,7 @@ int16_t dlsch_demod_shift;
 static void get_options(void) {
   int CC_id;
   int tddflag=0, nonbiotflag;
-  char *loopfile=NULL, *in_ip=NULL, *in_path=NULL;
+  char *loopfile=NULL;
   int dumpframe=0;
   uint32_t online_log_messages;
   uint32_t glog_level, glog_verbosity;

openair2/UTIL/OPT/probe.c

@@ -99,6 +99,8 @@ int opt_enabled=0;
 //static unsigned char g_PDUBuffer[1600];
 //static unsigned int g_PDUOffset;
 
+char in_ip[40];
+char in_path[FILENAME_MAX];
 FILE *file_fd = NULL;
 pcap_hdr_t file_header = {
   0xa1b2c3d4,   /* magic number */
@@ -439,8 +441,6 @@ void trace_pdu(int direction, uint8_t *pdu_buffer, unsigned int pdu_buffer_size,
 int init_opt(void)
 {
   char *in_type=NULL;
-  char *in_ip=NULL;
-  char *in_path=NULL;
   paramdef_t opt_params[]          = OPT_PARAMS_DESC ;
   checkedparam_t opt_checkParams[] = OPTPARAMS_CHECK_DESC;
   uint16_t in_port;