diff options
Diffstat (limited to 'bgpd/bgp_main.c')
| -rw-r--r-- | bgpd/bgp_main.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 2089c6b5..0219bcee 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -37,7 +37,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "bgpd/bgp_mplsvpn.h" /* bgpd options, we use GNU getopt library. */ -struct option longopts[] = +static const struct option longopts[] = { { "daemon", no_argument, NULL, 'd'}, { "config_file", required_argument, NULL, 'f'}, @@ -53,6 +53,7 @@ struct option longopts[] = { "version", no_argument, NULL, 'v'}, { "dryrun", no_argument, NULL, 'C'}, { "help", no_argument, NULL, 'h'}, + { "import-check", no_argument, NULL, 'I'}, { 0 } }; @@ -61,7 +62,7 @@ void sighup (void); void sigint (void); void sigusr1 (void); -struct quagga_signal_t bgp_signals[] = +static struct quagga_signal_t bgp_signals[] = { { .signal = SIGHUP, @@ -85,7 +86,7 @@ struct quagga_signal_t bgp_signals[] = char config_default[] = SYSCONFDIR BGP_DEFAULT_CONFIG; /* Route retain mode flag. */ -int retain_mode = 0; +static int retain_mode = 0; /* Master of threads. */ struct thread_master *master; @@ -94,14 +95,14 @@ struct thread_master *master; char *config_file = NULL; /* Process ID saved for use by init system */ -const char *pid_file = PATH_BGPD_PID; +static const char *pid_file = PATH_BGPD_PID; /* VTY port number and address. */ int vty_port = BGP_VTY_PORT; char *vty_addr = NULL; /* privileges */ -zebra_capabilities_t _caps_p [] = +static zebra_capabilities_t _caps_p [] = { ZCAP_BIND, ZCAP_NET_RAW, @@ -220,7 +221,7 @@ main (int argc, char **argv) /* Command line argument treatment. */ while (1) { - opt = getopt_long (argc, argv, "df:i:hp:l:A:P:rnu:g:vC", longopts, 0); + opt = getopt_long (argc, argv, "df:i:hp:l:A:P:rnu:g:vCI", longopts, 0); if (opt == EOF) break; @@ -282,6 +283,9 @@ main (int argc, char **argv) case 'C': dryrun = 1; break; + case 'I': + bgp_option_set (BGP_OPT_IMPORT_CHECK); + break; case 'h': usage (progname, 0); break; @@ -316,8 +320,12 @@ main (int argc, char **argv) return(0); /* Turn into daemon if daemon_mode is set. */ - if (daemon_mode) - daemon (0, 0); + if (daemon_mode && daemon (0, 0) < 0) + { + zlog_err("BGPd daemon failed: %s", strerror(errno)); + return (1); + } + /* Process ID file creation. */ pid_output (pid_file); |