diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-15 10:29:41 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-15 10:29:41 -0700 |
| commit | 3a52d9e39e4a2351369aa5b09e0601b723aa7494 (patch) | |
| tree | af5dde7201d0a25f9471d710fa48511bfb4707f3 | |
| parent | 32ab3831bbea92d1d73dfc110c60a47809a6b4ec (diff) | |
| download | quagga-3a52d9e39e4a2351369aa5b09e0601b723aa7494.tar.bz2 quagga-3a52d9e39e4a2351369aa5b09e0601b723aa7494.tar.xz | |
BGP main program cleanup
Check result of daemon() call to fix warning
Make local variables static
| -rw-r--r-- | bgpd/bgp_main.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 2089c6b5..620ca128 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'}, @@ -61,7 +61,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 +85,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 +94,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, @@ -316,8 +316,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); |