Fix parser for olsr --debug option

diff --git a/src/olsr_cfg.c b/src/olsr_cfg.c
index 5aa3a6a..7ba049d 100644 (file)
--- a/src/olsr_cfg.c
+++ b/src/olsr_cfg.c
@@ -731,7 +731,7 @@ parse_cfg_debug(char *argstr, struct olsr_config *rcfg, char *rmsg)
   int dlevel, i;
   dlevel = atoi(argstr);
 
-  if (dlevel < -2 || dlevel > 3) {
+  if (dlevel < MIN_DEBUGLVL || dlevel > MAX_DEBUGLVL) {
     sprintf(rmsg, "Error, debug level must be between -2 and 4\n");
     return CFG_ERROR;
   }
@@ -1363,7 +1363,7 @@ olsr_parse_cfg(int argc, char *argv[], const char *file, char *rmsg, struct olsr
     }
     if (!cfg_has_log[SEVERITY_ERR]) {
       /* no logging at all defined ? fall back to default */
-      char def[2] = "0";
+      char def[10] = DEF_DEBUGLVL;
       parse_cfg_debug(def, *rcfg, rmsg);
     }
   }

diff --git a/src/olsr_cfg.h b/src/olsr_cfg.h
index 2a73648..8d83298 100644 (file)
--- a/src/olsr_cfg.h
+++ b/src/olsr_cfg.h
@@ -48,7 +48,7 @@
 #define DEF_WILL_AUTO          true
 #define DEF_ALLOW_NO_INTS      true
 #define DEF_TOS                16
-#define DEF_DEBUGLVL           1
+#define DEF_DEBUGLVL           "0"
 #define DEF_IPC_CONNECTIONS    0
 #define DEF_USE_HYST           false
 #define DEF_FIB_METRIC         FIBM_FLAT
@@ -68,8 +68,8 @@
 #define MIN_POLLRATE        0.01
 #define MAX_NICCHGPOLLRT    100.0
 #define MIN_NICCHGPOLLRT    1.0
-#define MAX_DEBUGLVL        9
-#define MIN_DEBUGLVL        0
+#define MAX_DEBUGLVL        3
+#define MIN_DEBUGLVL        -2
 #define MAX_TOS             16
 #define MAX_WILLINGNESS     7
 #define MIN_WILLINGNESS     0