Improve configuration module error management at init time, Fix command line...

Improve configuration module error management at init time, Fix command line help option processing, remove shotopt field from parameter structure

common/config/config_cmdline.c

@@ -136,7 +136,7 @@ char *cfgpath;
 	    } else {
 	       sprintf(cfgpath,"%s",cfgoptions[i].optname);
 	    }
-            if ( ((strlen(*p) > 1) && (strcmp(*p + 1,cfgoptions[i].shortopt) == 0))  || 
+            if ( ((strlen(*p) == 2) && (strcmp(*p + 1,cfgpath) == 0))  || 
                  ((strlen(*p) > 2) && (strcmp(*p + 2,cfgpath ) == 0 )) ) {
                p++;
                j =+ processoption(&(cfgoptions[i]), *p);

common/config/config_load_configmodule.c

@@ -106,16 +106,19 @@ char *modeparams=NULL;
 char *cfgmode=NULL;
 char *strtokctx=NULL;
 char *atoken;
-
+uint32_t tmpflags=0;
 int i;
  
 
 /* first parse the command line to look for the -O option */
   opterr=0;
-  while ((i = getopt(argc, argv, "O:")) != -1) {
+  while ((i = getopt(argc, argv, "O:h")) != -1) {
        if ( i == 'O' ) {
           cfgparam = optarg; 
-       }      
+       } 
+        if ( i == 'h' ) {
+          tmpflags = CONFIG_HELP; 
+       }            
    }
    optind=1;
 
@@ -132,20 +135,21 @@ int i;
    i = sscanf(cfgparam,"%m[^':']:%ms",&cfgmode,&modeparams);
    if (i< 0) {
        fprintf(stderr,"[CONFIG] %s, %d, sscanf error parsing config source  %s: %s\n", __FILE__, __LINE__,cfgparam, strerror(errno));
-       return NULL;
+       cfgmode=strdup("libconfig");
+       modeparams = strdup("oaisoftmodem.conf");
    }
    else if ( i == 1 ) {
   /* -O argument doesn't contain ":" separator, legacy -O <conf file> option, default cfgmode to libconfig
      with one parameter, the path to the configuration file */
        modeparams=cfgmode;
        cfgmode=strdup("libconfig");
+       tmpflags = tmpflags | CONFIG_LEGACY;/* temporary, legacy mode */
    }
 
    cfgptr = malloc(sizeof(configmodule_interface_t));
    memset(cfgptr,0,sizeof(configmodule_interface_t));
-/* temporary, legacy mode */
-   if (i==1) cfgptr->rtflags = cfgptr->rtflags | CONFIG_LEGACY;
-/*--*/
+
+   cfgptr->rtflags = cfgptr->rtflags | tmpflags;
    cfgptr->argc   = argc;
    cfgptr->argv   = argv; 
    cfgptr->cfgmode=strdup(cfgmode);
@@ -178,17 +182,18 @@ int i;
    i=load_config_sharedlib(cfgptr);
    if (i< 0) {
       fprintf(stderr,"[CONFIG] %s %d config module %s couldn't be loaded\n", __FILE__, __LINE__,cfgmode);
-      return NULL;
+      cfgptr->rtflags = cfgptr->rtflags | CONFIG_HELP | CONFIG_ABORT;
    } else {
       printf("[CONFIG] config module %s loaded\n",cfgmode);
+      Config_Params[CONFIGPARAM_DEBUGFLAGS_IDX].uptr=&(cfgptr->rtflags);
+      config_get(Config_Params,CONFIG_PARAMLENGTH(Config_Params), CONFIG_SECTIONNAME ); 
    }
 
-   Config_Params[CONFIGPARAM_DEBUGFLAGS_IDX].uptr=&(cfgptr->rtflags);
-   config_get(Config_Params,CONFIG_PARAMLENGTH(Config_Params), CONFIG_SECTIONNAME );   
+  
 
    if (modeparams != NULL) free(modeparams);
    if (cfgmode != NULL) free(cfgmode);
-   
+   if (CONFIG_ISFLAGSET(CONFIG_ABORT)) config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params));
    return cfgptr;
 }
 

common/config/config_load_configmodule.h

@@ -44,7 +44,8 @@
 #define CONFIG_PRINTPARAMS    1        // print parameters values while processing
 #define CONFIG_DEBUGPTR       2        // print memory allocation/free debug messages
 #define CONFIG_DEBUGCMDLINE   4        // print command line processing messages
-
+#define CONFIG_HELP           8        // print help message
+#define CONFIG_ABORT          16       // config failed,abort execution 
 /* temporary flag to be able to use legacy config mechanism */
 #define CONFIG_LEGACY             (1 << 10)     
 
@@ -71,17 +72,21 @@ typedef struct configmodule_interface
 #ifdef CONFIG_LOADCONFIG_MAIN
 configmodule_interface_t *cfgptr=NULL;
 
-static char config_helpstr [] =" \
-      config debugflags: mask, 1->print parameters, 2->print memory allocations debug messages \
-                               4->print command line processing debug messages \
-          -O <config mode><:dbg> \
-          debugflags can also be defined in the config_libconfig section of the config file \
-";
+static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbg[debugflags]> \n \
+          debugflags can also be defined in the config_libconfig 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 ";
+			       
 #define CONFIG_SECTIONNAME "config"
-
 #define CONFIGPARAM_DEBUGFLAGS_IDX        0
+
+
 static paramdef_t Config_Params[] = {
-{"debugflags",         "",   config_helpstr,   0,   uptr:NULL,   defintval:0,        TYPE_MASK,  0}, 
+/*-----------------------------------------------------------------------------------------------------------------------*/
+/*                                            config parameters for config module                                        */
+/*   optname              helpstr           paramflags     XXXptr       defXXXval            type       numelt           */
+/*-----------------------------------------------------------------------------------------------------------------------*/
+{"debugflags",            config_helpstr,   0,             uptr:NULL,   defintval:0,        TYPE_MASK,  0}, 
 };
 
 #else

common/config/config_paramdesc.h

@@ -38,7 +38,7 @@
 
 
 #define MAX_OPTNAME_SIZE 64
-#define MAX_SHORTOPT_SIZE 8
+
 
 
 /* parameter flags definitions */
@@ -58,7 +58,6 @@
 typedef struct paramdef
 {
    char optname[MAX_OPTNAME_SIZE];        /* parameter name, can be used as long command line option */
-   char shortopt[MAX_SHORTOPT_SIZE];      /* short command line option */
    char *helpstr;                         /* help string */
    unsigned int paramflags;               /* value is a "ored" combination of above PARAMFLAG_XXXX values */
    union {                                /* pointer to the parameter value, completed by the config module */

common/config/config_userapi.c

@@ -112,7 +112,10 @@ void config_printhelp(paramdef_t *params,int numparams)
 {
    for (int i=0 ; i<numparams ; i++) {
        if ( params[i].helpstr != NULL) {
-           printf("%s", params[i].helpstr);
+           printf("%s%s: %s",
+	           (strlen(params[i].optname) <= 1) ? "-" : "--", 
+	           params[i].optname,
+	           params[i].helpstr);
        }
    }
 }

targets/RT/USER/lte-softmodem.c

@@ -715,26 +715,27 @@ static void get_options(void) {
   config_process_cmdline( cmdline_ttraceparams,sizeof(cmdline_ttraceparams)/sizeof(paramdef_t),NULL);   
 #endif
 
+  if ( !(CONFIG_ISFLAGSET(CONFIG_ABORT)) ) {
+    if (UE_flag == 0) {
+      memset((void*)&RC,0,sizeof(RC));
+      /* Read RC configuration file */
+      RCConfig(NULL);
+      NB_eNB_INST = RC.nb_inst;
+      NB_RU	  = RC.nb_RU;
+      printf("Configuration: nb_inst %d, nb_ru %d\n",NB_eNB_INST,NB_RU);
 
-  if (UE_flag == 0) {
-    memset((void*)&RC,0,sizeof(RC));
-    /* Read RC configuration file */
-    RCConfig(NULL);
-    NB_eNB_INST = RC.nb_inst;
-    NB_RU       = RC.nb_RU;
-    printf("Configuration: nb_inst %d, nb_ru %d\n",NB_eNB_INST,NB_RU);
-
-    
-  } else if (UE_flag == 1) {
-    if (conf_config_file_name != NULL) {
       
-      // Here the configuration file is the XER encoded UE capabilities
-      // Read it in and store in asn1c data structures
-      strcpy(uecap_xer,conf_config_file_name);
-      uecap_xer_in=1;
+    } else if (UE_flag == 1) {
+      if (conf_config_file_name != NULL) {
+  	
+  	// Here the configuration file is the XER encoded UE capabilities
+  	// Read it in and store in asn1c data structures
+  	strcpy(uecap_xer,conf_config_file_name);
+  	uecap_xer_in=1;
 
+      }
     }
-  }
+  } /* CONFIG_ABORT not set */
 }
 
 
@@ -1429,7 +1430,11 @@ int main( int argc, char **argv )
   
   if ( CONFIG_ISFLAGSET(CONFIG_LEGACY) == 0) {
       printf("configuration via the configuration module \n");
-      get_options (); //Command-line options, enb_properties
+      get_options (); 
+       if (CONFIG_ISFLAGSET(CONFIG_ABORT)) {
+           fprintf(stderr,"Getting configuration failed\n");
+	   exit(-1);
+       }
   } else {
       printf("Legacy configuration mode \n");
       old_get_options (argc,argv);