diff options
Diffstat (limited to 'pimd/pim_main.c')
| -rw-r--r-- | pimd/pim_main.c | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/pimd/pim_main.c b/pimd/pim_main.c index e4aa2de594..2e81ac53fd 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -44,10 +44,9 @@ #include "pim_version.h" #include "pim_signals.h" #include "pim_zebra.h" - -#ifdef PIM_ZCLIENT_DEBUG -extern int zclient_debug; -#endif +#include "pim_msdp.h" +#include "pim_iface.h" +#include "pim_rp.h" extern struct host host; @@ -78,6 +77,7 @@ zebra_capabilities_t _caps_p [] = ZCAP_NET_ADMIN, ZCAP_SYS_ADMIN, ZCAP_NET_RAW, + ZCAP_BIND, }; /* pimd privileges to run with */ @@ -113,18 +113,9 @@ Daemon which manages PIM.\n\n\ -P, --vty_port Set vty's port number\n\ --vty_socket Override vty socket path\n\ -v, --version Print program version\n\ -" - -#ifdef PIM_ZCLIENT_DEBUG -"\ --Z, --debug_zclient Enable zclient debugging\n\ -" -#endif - -"\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, PIMD_BUG_ADDRESS); +Report bugs to %s\n", progname, PACKAGE_BUGREPORT); } exit (status); @@ -189,11 +180,6 @@ int main(int argc, char** argv, char** envp) { print_version(progname); exit (0); break; -#ifdef PIM_ZCLIENT_DEBUG - case 'Z': - zclient_debug = 1; - break; -#endif case 'h': usage (0); break; @@ -218,8 +204,12 @@ int main(int argc, char** argv, char** envp) { vrf_init (); access_list_init(); prefix_list_init (); + prefix_list_add_hook (pim_rp_prefix_list_update); + prefix_list_delete_hook (pim_rp_prefix_list_update); + pim_route_map_init (); pim_init(); + pim_msdp_init (master); /* * Initialize zclient "update" and "lookup" sockets @@ -266,11 +256,6 @@ int main(int argc, char** argv, char** envp) { PIM_DO_DEBUG_ZEBRA; #endif -#ifdef PIM_ZCLIENT_DEBUG - zlog_notice("PIM_ZCLIENT_DEBUG: zclient debugging is supported, mode is %s (see option -Z)", - zclient_debug ? "ON" : "OFF"); -#endif - #ifdef PIM_CHECK_RECV_IFINDEX_SANITY zlog_notice("PIM_CHECK_RECV_IFINDEX_SANITY: will match sock/recv ifindex"); #ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH @@ -282,12 +267,6 @@ int main(int argc, char** argv, char** envp) { zlog_notice("PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall"); #endif -#ifdef HAVE_CLOCK_MONOTONIC - zlog_notice("HAVE_CLOCK_MONOTONIC"); -#else - zlog_notice("!HAVE_CLOCK_MONOTONIC"); -#endif - while (thread_fetch(master, &thread)) thread_call(&thread); |