Merge branch 'develop_integration_2019_w03' into 'develop'

See merge request oai/openairinterface5g!486

Integration Branch: 2019 week 03

* MR 477: Resolve "384 obsolete files to delete"
* MR 479: Fix on allow remote connection in tcpbridge
* MR 480: Ue hotfix u emode during initial connection
* MR 484: Fix on T early logs
* MR 485: Fix on exit softmodem when a command line option requiring an argument is specified

cmake_targets/CMakeLists.txt

@@ -183,7 +183,6 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${CMAKE_CU
 #########################
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
-add_definitions(-DCMAKER)
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -DMALLOC_CHECK_=3 -O2")
 
@@ -2154,7 +2153,6 @@ add_executable(test_epc_generate_scenario
   ${OPENAIR2_DIR}/ENB_APP/enb_config.h
   ${OPENAIR2_DIR}/COMMON/commonDef.h
   ${OPENAIR2_DIR}/COMMON/messages_def.h
-  ${OPENAIR2_DIR}/COMMON/messages_types.h
   ${OPENAIR3_DIR}/S1AP/s1ap_eNB_defs.h
   )
 target_link_libraries (test_epc_generate_scenario
@@ -2174,7 +2172,6 @@ add_executable(test_epc_play_scenario
   ${OPENAIR3_DIR}/TEST/EPC_TEST/play_scenario.h
   ${OPENAIR2_DIR}/COMMON/commonDef.h
   ${OPENAIR2_DIR}/COMMON/messages_def.h
-  ${OPENAIR2_DIR}/COMMON/messages_types.h
   )
 target_include_directories(test_epc_play_scenario PUBLIC /usr/local/share/asn1c)
 target_link_libraries (test_epc_play_scenario

cmake_targets/at_commands/CMakeLists.txt

@@ -76,7 +76,6 @@ macro(add_boolean_option name val helpstr)
 endmacro(add_boolean_option)
 
 # compilation flags
-# added CMAKER conditional compilation to not bother legacy building system
 #############################################
 if(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
@@ -84,7 +83,7 @@ endif()
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)
 
 #
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -DCMAKER")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat ")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")
 

common/config/config_cmdline.c

@@ -75,6 +75,7 @@ int processoption(paramdef_t *cfgoptions, char *value) {
   if ( value == NULL) {
     if( (cfgoptions->paramflags &PARAMFLAG_BOOL) == 0 ) { /* not a boolean, argument required */
       fprintf(stderr,"[CONFIG] command line, option %s requires an argument\n",cfgoptions->optname);
+      exit_fun("[CONFIG] command line parsing fatal error");
       return 0;
     } else {        /* boolean value option without argument, set value to true*/
       tmpval = defbool;
@@ -143,7 +144,10 @@ int processoption(paramdef_t *cfgoptions, char *value) {
   return optisset;
 }
 
-int config_check_cmdlineopt(char *prefix) {
+/*--------------------------------------------------------------------*/
+/*  check unknown options in the command line
+*/
+int config_check_unknown_cmdlineopt(char *prefix) {
   int unknowndetected=0;
   char testprefix[CONFIG_MAXOPTLENGTH]="";
   int finalcheck = 0;
@@ -161,6 +165,8 @@ int config_check_cmdlineopt(char *prefix) {
 
     if ( !finalcheck && testprefix[0]==0 && index(config_get_if()->argv[i],'.') != NULL) continue;
 
+    if ( !finalcheck && isdigit(config_get_if()->argv[i][0])) continue;
+
     if ( !finalcheck && config_get_if()->argv[i][0] == '-' && isdigit(config_get_if()->argv[i][1])) continue;
 
     if ( (config_get_if()->argv_info[i] & CONFIG_CMDLINEOPT_PROCESSED) == 0 ) {
@@ -173,7 +179,7 @@ int config_check_cmdlineopt(char *prefix) {
   printf_cmdl("[CONFIG] %i unknown option(s) in command line starting with %s (section %s)\n",
               unknowndetected,testprefix,((prefix==NULL)?"":prefix));
   return unknowndetected;
-}  /* parse_cmdline*/
+}  /* config_check_unknown_cmdlineopt */
 
 int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix) {
   int c = config_get_if()->argc;
@@ -269,7 +275,7 @@ int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
   printf_cmdl("[CONFIG] %s %i options set from command line\n",((prefix == NULL) ? "(root)":prefix),j);
 
   if ( !(CONFIG_ISFLAGSET( CONFIG_NOCHECKUNKOPT )) ) {
-    i=config_check_cmdlineopt(prefix);
+    i=config_check_unknown_cmdlineopt(prefix);
 
     if (i > 0) {
       fprintf(stderr,"[CONFIG] %i unknown options for section %s detected in command line\n",

common/config/config_userapi.c

@@ -370,6 +370,12 @@ int config_checkstr_assign_integer(paramdef_t *param) {
   return -1;
 }
 
+void config_set_checkfunctions(paramdef_t *params, checkedparam_t *checkfunctions, int numparams) {
+  for (int i=0; i< numparams ; i++ ) {
+    params[i].chkPptr = &(checkfunctions[i]);
+  }
+}
+
 int config_setdefault_string(paramdef_t *cfgoptions, char *prefix) {
   int status = 0;
 

common/config/config_userapi.h

@@ -57,10 +57,13 @@ extern int config_assign_ipv4addr(paramdef_t *cfgoptions, char *ipv4addr);
 
 /* apis to get/check parameters, to be used by oai modules, at configuration time */
 #define CONFIG_CHECKALLSECTIONS "ALLSECTIONS"
-extern int config_check_cmdlineopt(char *prefix);
+extern int config_check_unknown_cmdlineopt(char *prefix);
 extern int config_get(paramdef_t *params,int numparams, char *prefix);
 extern int config_getlist(paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix);
 
+/* apis to set some of the paramdef_t fields before using the get/getlist api's */
+extern void config_set_checkfunctions(paramdef_t *params, checkedparam_t *checkfunctions, int numparams);
+
 /* apis to retrieve parameters info after calling get or getlist functions */
 extern int config_isparamset(paramdef_t *params,int paramidx);
 extern int config_get_processedint(paramdef_t *cfgoption);

common/utils/T/Makefile

@@ -19,7 +19,7 @@ T_IDs.h: $(GENIDS) T_messages.txt
 	./$(GENIDS) T_messages.txt T_IDs.h
 
 check_vcd:
-	gcc -Wall -I. -I.. -I../itti -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
+	gcc -Wall -I. -I.. -I../itti -I../../../openair2/COMMON -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
 	./_check_vcd || (rm -f ./_check_vcd ./T_IDs.h ./T_messages.txt.h && false)
 	rm -f ./_check_vcd
 

common/utils/T/T.c

@@ -19,7 +19,7 @@
 /* array used to activate/disactivate a log */
 static int T_IDs[T_NUMBER_OF_IDS];
 int *T_active = T_IDs;
-int T_stdout;
+int T_stdout = 1;
 
 static int T_socket;
 

common/utils/assertions.h

@@ -22,9 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#ifdef CMAKER
 #include <platform_types.h>
-#endif
 
 #if defined(ENB_MODE)
 # define display_backtrace()

common/utils/time_utils.h

-#ifndef _TIME_UTILS_H_
-#define _TIME_UTILS_H_
-
-#include <time.h>
-#include <stdint.h>
-
-static inline int64_t clock_difftime_ns(struct timespec start, struct timespec end)
-{
-  struct timespec temp;
-  int64_t temp_ns;
-
-  if ((end.tv_nsec-start.tv_nsec)<0) {
-    temp.tv_sec = end.tv_sec-start.tv_sec-1;
-    temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec;
-  } else {
-    temp.tv_sec = end.tv_sec-start.tv_sec;
-    temp.tv_nsec = end.tv_nsec-start.tv_nsec;
-  }
-  temp_ns = (int64_t)(temp.tv_sec) * (int64_t)1000000000 + (temp.tv_nsec);
-  return temp_ns;
-}
-
-#endif /* _TIME_UTILS_H_ */

openair1/PHY/CODING/scrambler.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-unsigned char scrambling_sequence[1024] = {
-  208,
-  127,
-  52,
-  95,
-  204,
-  135,
-  48,
-  31,
-  248,
-  32,
-  208,
-  135,
-  192,
-  232,
-  63,
-  175,
-  4,
-  212,
-  119,
-  24,
-  169,
-  162,
-  101,
-  144,
-  75,
-  109,
-  75,
-  29,
-  91,
-  191,
-  165,
-  246,
-  177,
-  71,
-  16,
-  92,
-  68,
-  80,
-  132,
-  4,
-  248,
-  251,
-  32,
-  65,
-  125,
-  56,
-  94,
-  86,
-  152,
-  11,
-  201,
-  134,
-  39,
-  250,
-  19,
-  162,
-  25,
-  190,
-  62,
-  3,
-  190,
-  18,
-  188,
-  215,
-  97,
-  239,
-  72,
-  11,
-  0,
-  26,
-  57,
-  211,
-  146,
-  37,
-  205,
-  121,
-  204,
-  83,
-  13,
-  206,
-  53,
-  27,
-  214,
-  32,
-  54,
-  214,
-  82,
-  125,
-  226,
-  108,
-  169,
-  102,
-  247,
-  255,
-  32,
-  171,
-  201,
-  112,
-  20,
-  253,
-  65,
-  192,
-  38,
-  78,
-  114,
-  40,
-  95,
-  32,
-  70,
-  194,
-  242,
-  153,
-  207,
-  63,
-  61,
-  117,
-  122,
-  32,
-  73,
-  60,
-  160,
-  140,
-  99,
-  235,
-  118,
-  176,
-  75,
-  102,
-  254,
-  5,
-  67,
-  194,
-  122,
-  62,
-  226,
-  56,
-  69,
-  123,
-  213,
-  179,
-  119,
-  221,
-  23,
-  63,
-  26,
-  160,
-  233,
-  166,
-  179,
-  243,
-  169,
-  190,
-  183,
-  146,
-  169,
-  185,
-  216,
-  214,
-  158,
-  86,
-  139,
-  214,
-  143,
-  181,
-  0,
-  9,
-  147,
-  254,
-  105,
-  138,
-  213,
-  118,
-  14,
-  74,
-  153,
-  110,
-  41,
-  47,
-  172,
-  91,
-  216,
-  117,
-  156,
-  62,
-  56,
-  75,
-  113,
-  6,
-  123,
-  178,
-  118,
-  97,
-  82,
-  75,
-  96,
-  21,
-  148,
-  170,
-  120,
-  227,
-  0,
-  245,
-  25,
-  147,
-  243,
-  185,
-  203,
-  135,
-  48,
-  104,
-  89,
-  38,
-  71,
-  30,
-  74,
-  219,
-  130,
-  107,
-  75,
-  244,
-  138,
-  8,
-  8,
-  248,
-  175,
-  65,
-  234,
-  35,
-  125,
-  138,
-  0,
-  95,
-  23,
-  171,
-  177,
-  166,
-  196,
-  173,
-  235,
-  244,
-  124,
-  20,
-  22,
-  78,
-  32,
-  207,
-  173,
-  103,
-  232,
-  84,
-  18,
-  227,
-  246,
-  127,
-  136,
-  28,
-  188,
-  39,
-  132,
-  79,
-  14,
-  62,
-  80,
-  248,
-  171,
-  21,
-  160,
-  188,
-  110,
-  125,
-  55,
-  198,
-  139,
-  185,
-  28,
-  127,
-  239,
-  246,
-  223,
-  47,
-  55,
-  63,
-  63,
-  129,
-  253,
-  175,
-  122,
-  182,
-  139,
-  52,
-  163,
-  164,
-  177,
-  6,
-  187,
-  220,
-  159,
-  76,
-  36,
-  164,
-  108,
-  218,
-  189,
-  250,
-  148,
-  201,
-  45,
-  207,
-  174,
-  81,
-  195,
-  108,
-  96,
-  203,
-  132,
-  210,
-  34,
-  142,
-  247,
-  238,
-  139,
-  84,
-  84,
-  194,
-  168,
-  46,
-  9,
-  238,
-  29,
-  135,
-  115,
-  95,
-  12,
-  218,
-  18,
-  134,
-  110,
-  83,
-  110,
-  44,
-  80,
-  80,
-  216,
-  126,
-  160,
-  65,
-  142,
-  142,
-  209,
-  69,
-  234,
-  200,
-  184,
-  171,
-  248,
-  185,
-  148,
-  203,
-  90,
-  143,
-  231,
-  29,
-  47,
-  214,
-  151,
-  154,
-  137,
-  152,
-  228,
-  192,
-  182,
-  108,
-  200,
-  226,
-  204,
-  82,
-  170,
-  110,
-  197,
-  143,
-  169,
-  230,
-  75,
-  204,
-  177,
-  222,
-  142,
-  1,
-  104,
-  130,
-  224,
-  201,
-  29,
-  223,
-  246,
-  132,
-  173,
-  42,
-  33,
-  165,
-  147,
-  208,
-  124,
-  208,
-  198,
-  51,
-  78,
-  76,
-  216,
-  164,
-  250,
-  186,
-  214,
-  57,
-  52,
-  52,
-  199,
-  37,
-  3,
-  242,
-  120,
-  179,
-  26,
-  233,
-  51,
-  42,
-  11,
-  108,
-  26,
-  41,
-  192,
-  41,
-  221,