diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-02-11 21:29:57 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-03-07 16:21:01 +0100 |
| commit | 819dc8bbbc778fc0df326c687dcdda4c2fd2b683 (patch) | |
| tree | 4d543b9623d1ce81cc45ced96906dd0acd7f013a /nhrpd/nhrp_main.c | |
| parent | nhrpd: implement next hop resolution protocol (diff) | |
| download | frr-819dc8bbbc778fc0df326c687dcdda4c2fd2b683.tar.xz frr-819dc8bbbc778fc0df326c687dcdda4c2fd2b683.zip | |
nhrpd: adapt to API changes
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'nhrpd/nhrp_main.c')
| -rw-r--r-- | nhrpd/nhrp_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 29349a038..dfb76a408 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -17,11 +17,14 @@ #include "version.h" #include "log.h" #include "memory.h" +#include "memory_vty.h" #include "command.h" #include "nhrpd.h" #include "netlink.h" +DEFINE_MGROUP(NHRPD, "NHRP") + unsigned int debug_flags = 0; struct thread_master *master; @@ -88,7 +91,7 @@ Daemon which manages NHRP protocol.\n\n\ -v, --version Print program version\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); exit(status); } @@ -184,12 +187,12 @@ static struct quagga_signal_t sighandlers[] = { int main(int argc, char **argv) { struct thread thread; - const char *progname; + const char *progname, *p; /* Set umask before anything for security */ umask(0027); - progname = basename(argv[0]); - zlog_default = openzlog(progname, ZLOG_NHRP, LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); + progname = ((p = strrchr (argv[0], '/')) ? ++p : argv[0]); + zlog_default = openzlog(progname, ZLOG_NHRP, 0, LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); zlog_set_level(NULL, ZLOG_DEST_STDOUT, LOG_WARNING); parse_arguments(progname, argc, argv); |