Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15

common/config/config_cmdline.c

@@ -255,7 +255,7 @@ int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix)
         if ( ((strlen(oneargv) == 2) && (strcmp(oneargv + 1,cfgpath) == 0))  || /* short option, one "-" */
              ((strlen(oneargv) > 2) && (strcmp(oneargv + 2,cfgpath ) == 0 )) || /* long option beginning with "--" */
              ((strlen(oneargv) == 2) && (strcmp(oneargv + 1,cfgoptions[n].optname) == 0) && (cfgoptions[n].paramflags & PARAMFLAG_CMDLINE_NOPREFIXENABLED )) ||
-             ((strlen(oneargv) > 2) && (strcmp(oneargv + 2,cfgpath ) == 0 ) && (cfgoptions[n].paramflags & PARAMFLAG_CMDLINE_NOPREFIXENABLED )) ) {
+             ((strlen(oneargv) > 2) && (strcmp(oneargv + 2, cfgoptions[n].optname) == 0 ) && (cfgoptions[n].paramflags & PARAMFLAG_CMDLINE_NOPREFIXENABLED )) ) {
           char *valptr=NULL;
           int ret;
           config_get_if()->argv_info[i] |= CONFIG_CMDLINEOPT_PROCESSED;

common/config/config_load_configmodule.h

@@ -82,10 +82,12 @@ typedef struct configmodule_interface {
 #ifdef CONFIG_LOADCONFIG_MAIN
 configmodule_interface_t *cfgptr=NULL;
 
-static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbgl[debugflags]> \n \
-          debugflags can also be defined in the config_libconfig section of the config file\n \
+static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbgl[debugflags]><:incp[path]>\n \
+          debugflags can also be defined in the config section of the config file\n \
           debugflags: mask,    1->print parameters, 2->print memory allocations debug messages\n \
-                               4->print command line processing debug messages\n ";
+                               4->print command line processing debug messages\n \
+          incp parameter can be used to define the include path used for config files (@include directive)\n \
+                         defaults is set to the path of the main config file.\n";
 
 #define CONFIG_SECTIONNAME "config"
 #define CONFIGPARAM_DEBUGFLAGS_IDX        0

common/config/libconfig/config_libconfig.c

@@ -33,8 +33,9 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
+ #include <libgen.h>
 
-#include <arpa/inet.h>
 
 #include "config_libconfig.h"
 #include "config_libconfig_private.h"
@@ -347,17 +348,35 @@ int config_libconfig_init(char *cfgP[], int numP) {
   config_get_if()->numptrs=0;
   memset(config_get_if()->ptrs,0,sizeof(void *) * CONFIG_MAX_ALLOCATEDPTRS);
   memset(config_get_if()->ptrsAllocated, 0, sizeof(config_get_if()->ptrsAllocated));
-
+  /* search for include path parameter and set config file include path accordingly */
+  for (int i=0; i<numP; i++) {
+  	  if (strncmp(cfgP[i],"incp",4) == 0) {
+  	  	  config_set_include_dir (&(libconfig_privdata.cfg),cfgP[i]+4);
+  	  break;
+  	  }
+  }
+  /* dirname may modify the input path and returned ptr may points to part of input path */
+  char *tmppath = strdup(libconfig_privdata.configfile);
+  if ( config_get_include_dir (&(libconfig_privdata.cfg)) == NULL) {
+  	 config_set_include_dir (&(libconfig_privdata.cfg),dirname( tmppath )); 	 
+  }
+  
+  const char *incp = config_get_include_dir (&(libconfig_privdata.cfg)) ;
+ 
+  printf("[LIBCONFIG] Path for include directive set to: %s\n", (incp!=NULL)?incp:"libconfig defaults");
+  /* set convertion option to allow integer to float conversion*/
+   config_set_auto_convert (&(libconfig_privdata.cfg), CONFIG_TRUE);
   /* Read the file. If there is an error, report it and exit. */
-  if(! config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile)) {
-    fprintf(stderr,"[LIBCONFIG] %s %d file %s - %d - %s\n",__FILE__, __LINE__,
+  if( config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile) == CONFIG_FALSE) {
+    fprintf(stderr,"[LIBCONFIG] %s %d file %s - line %d: %s\n",__FILE__, __LINE__,
             libconfig_privdata.configfile, config_error_line(&(libconfig_privdata.cfg)),
             config_error_text(&(libconfig_privdata.cfg)));
     config_destroy(&(libconfig_privdata.cfg));
     printf( "\n");
+    free(tmppath);
     return -1;
   }
-
+  free(tmppath);
   return 0;
 }
 

common/utils/LOG/log.c

@@ -243,7 +243,7 @@ int write_file_matlab(const char *fname,
       fprintf(fp,"%d \n",((unsigned char *)&data)[0]);
       break;
   default:
-    AssertFatal(false, "unknown dump format: %d\n", format);
+    AssertFatal(false, "unknown dump format: %u\n", format);
   }
 
   if ((format != 10 && format !=11 && format !=12 && format != 13 && format != 15) || multiVec) {

common/utils/backtrace.c

@@ -38,7 +38,7 @@ void display_backtrace(void) {
   size_t i;
   char *test=getenv("NO_BACKTRACE");
 
-  if (test!=0) *((int *)0)=0;
+  if (test!=0) abort();
 
   size = backtrace(array, 10);
   strings = backtrace_symbols(array, size);

common/utils/telnetsrv/telnetsrv.c

@@ -461,12 +461,12 @@ int process_command(char *buf) {
   int i,j,k;
   char modulename[TELNET_CMD_MAXSIZE];
   char cmd[TELNET_CMD_MAXSIZE];
-  char cmdb[TELNET_MAX_MSGLENGTH];
+  char *cmdb=NULL;
   char *bufbck;
   int rt;
   memset(modulename,0,sizeof(modulename));
   memset(cmd,0,sizeof(cmd));
-  memset(cmdb,0,sizeof(cmdb));
+  
 
   if (strncasecmp(buf,"ex",2) == 0)
     return CMDSTATUS_EXIT;
@@ -490,12 +490,10 @@ int process_command(char *buf) {
     return CMDSTATUS_FOUND;
   }
 
-  memset(modulename,0,sizeof(modulename));
-  memset(cmd,0,sizeof(cmd));
-  memset(cmdb,0,sizeof(cmdb));
+  
   bufbck=strdup(buf);
   rt=CMDSTATUS_NOTFOUND;
-  j = sscanf(buf,"%19s %19s %19[^\t\n]",modulename,cmd,cmdb);
+  j = sscanf(buf,"%19s %19s %m[^\t\n]",modulename,cmd,&cmdb);
 
   if (telnetparams.telnetdbg > 0)
     printf("process_command: %i words, module=%s cmd=%s, parameters= %s\n",j,modulename,cmd,cmdb);
@@ -562,7 +560,7 @@ int process_command(char *buf) {
       rt= CMDSTATUS_FOUND;
     } /* loop */
   } /* for i */
-
+  free(cmdb);
   free(bufbck);
   return rt;
 }