diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-11-14 01:56:02 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-03-08 00:15:39 +0100 |
| commit | 16077f2fc5f4d73648b4ebef877e1f021864358d (patch) | |
| tree | 73d9eb31cab0943147924a5d93c938021682df36 /pimd/pim_main.c | |
| parent | *: add frr_config_fork() (diff) | |
| download | frr-16077f2fc5f4d73648b4ebef877e1f021864358d.tar.xz frr-16077f2fc5f4d73648b4ebef877e1f021864358d.zip | |
*: add frr_run()
Contains the fetch-and-run-thread logic, and vty startup (which is the
last thing happening before entering the main loop).
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_main.c')
| -rw-r--r-- | pimd/pim_main.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pimd/pim_main.c b/pimd/pim_main.c index f446e33af..ba1c511d1 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -90,8 +90,6 @@ FRR_DAEMON_INFO(pimd, PIM, ) int main(int argc, char** argv, char** envp) { - struct thread thread; - frr_preinit(&pimd_di, argc, argv); frr_opt_add("", longopts, ""); @@ -138,11 +136,6 @@ int main(int argc, char** argv, char** envp) { frr_config_fork(); - frr_vty_serv(); - - zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d", - FRR_VERSION, PIMD_VERSION, pimd_di.vty_port); - #ifdef PIM_DEBUG_BYDEFAULT zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands"); PIM_DO_DEBUG_PIM_EVENTS; @@ -165,11 +158,7 @@ int main(int argc, char** argv, char** envp) { zlog_notice("PIM_UNEXPECTED_KERNEL_UPCALL: report unexpected kernel upcall"); #endif - while (thread_fetch(master, &thread)) - thread_call(&thread); - - zlog_err("%s %s: thread_fetch() returned NULL, exiting", - __FILE__, __PRETTY_FUNCTION__); + frr_run(master); /* never reached */ return 0; |