DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Fixed use of --verbose command line switch.

Browse Source 
Set default log verbosity to LOG_INFO in the log_msg driver.
This commit is contained in:
Franck Joncourt 2013-06-24 23:15:50 +02:00 committed by Michael Rash
parent 5db1eeb268
commit 7fde3949da
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
server/config_init.c
View File

@ -685,31 +685,32 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
clean_exit(opts, NO_FW_CLEANUP, EXIT_SUCCESS);
break;
/* Look for configuration file arg.
*/
case 'c':
set_config_entry(opts, CONF_CONFIG_FILE, optarg);
got_conf_file++;
/* If we already have the config_override option, we are done.
*/
if(got_override_config > 0)
/* Verbosity level */
case 'v':
opts->verbose++;
break;
/* Look for override configuration file arg.
*/
case 'O':
set_config_entry(opts, CONF_OVERRIDE_CONFIG, optarg);
got_override_config++;
/* If we already have the conf_file option, we are done.
/* Look for configuration file arg.
*/
if(got_conf_file > 0)
break;
/* Verbosity level */
case 'v':
opts->verbose++;
break;
case 'c':
set_config_entry(opts, CONF_CONFIG_FILE, optarg);
got_conf_file++;
/* If we already have the config_override option, we are done.
*/
if(got_override_config > 0)
break;
/* Look for override configuration file arg.
*/
case 'O':
set_config_entry(opts, CONF_OVERRIDE_CONFIG, optarg);
got_override_config++;
/* If we already have the conf_file option, we are done.
*/
if(got_conf_file > 0)
break;
}
}
@ -870,6 +871,9 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
case 'S':
opts->status = 1;
break;
/* Verbosity level - handled previously */
case 'v':
break;
case 'V':
fprintf(stdout, "fwknopd server %s\n", MY_VERSION);
clean_exit(opts, NO_FW_CLEANUP, EXIT_SUCCESS);

2
server/log_msg.h
View File

@ -44,7 +44,7 @@
#define LOG_STDERR_ONLY (LOG_STDERR | LOG_WITHOUT_SYSLOG)
#define LOG_VERBOSITY_MASK 0x0FFF
#define LOG_DEFAULT_VERBOSITY LOG_NOTICE /*!< Default verbosity to use */
#define LOG_DEFAULT_VERBOSITY LOG_INFO /*!< Default verbosity to use */
void init_logging(fko_srv_options_t *opts);
void free_logging(void);