*: 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>

1 files changed, 1 insertions, 14 deletions

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 2d5ae02fb..6c994189e 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -191,7 +191,6 @@ int
 main (int argc, char *argv[], char *envp[])
 {
   int opt;
-  struct thread thread;
 
   frr_preinit (&ospf6d_di, argc, argv);
   frr_opt_add ("", longopts, "");
@@ -232,19 +231,7 @@ main (int argc, char *argv[], char *envp[])
   ospf6_init ();
 
   frr_config_fork ();
-
-  frr_vty_serv ();
-
-  /* Print start message */
-  zlog_notice ("OSPF6d (Quagga-%s ospf6d-%s) starts: vty@%d",
-               FRR_VERSION, OSPF6_DAEMON_VERSION, ospf6d_di.vty_port);
-
-  /* Start finite state machine, here we go! */
-  while (thread_fetch (master, &thread))
-    thread_call (&thread);
-
-  /* Log in case thread failed */
-  zlog_warn ("Thread failed");
+  frr_run (master);
 
   /* Not reached. */
   ospf6_exit (0);