summaryrefslogtreecommitdiffstats
path: root/zebra/main.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2016-11-14 01:56:02 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2017-03-08 00:15:39 +0100
commit16077f2fc5f4d73648b4ebef877e1f021864358d (patch)
tree73d9eb31cab0943147924a5d93c938021682df36 /zebra/main.c
parent*: add frr_config_fork() (diff)
downloadfrr-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 '')
-rw-r--r--zebra/main.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/zebra/main.c b/zebra/main.c
index 3aa40fa92..7177fe329 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -219,7 +219,6 @@ int
main (int argc, char **argv)
{
// int batch_mode = 0;
- struct thread thread;
char *zserv_path = NULL;
char *fpm_format = NULL;
@@ -360,13 +359,7 @@ main (int argc, char **argv)
/* This must be done only after locking pidfile (bug #403). */
zebra_zserv_socket_init (zserv_path);
- frr_vty_serv ();
-
- /* Print banner. */
- zlog_notice ("Zebra %s starting: vty@%d", FRR_VERSION, zebra_di.vty_port);
-
- while (thread_fetch (zebrad.master, &thread))
- thread_call (&thread);
+ frr_run (zebrad.master);
/* Not reached... */
return 0;