summaryrefslogtreecommitdiff
path: root/ripd/rip_main.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2016-11-14 09:56:02 +0900
committerDavid Lamparter <equinox@opensourcerouting.org>2017-03-08 00:15:39 +0100
commit16077f2fc5f4d73648b4ebef877e1f021864358d (patch)
tree73d9eb31cab0943147924a5d93c938021682df36 /ripd/rip_main.c
parenteb05883f3ecd94be017eb7d15181a989f26541ee (diff)
*: 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 'ripd/rip_main.c')
-rw-r--r--ripd/rip_main.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 3bbd12835d..a9382d942f 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -146,8 +146,6 @@ FRR_DAEMON_INFO(ripd, RIP,
int
main (int argc, char **argv)
{
- struct thread thread;
-
frr_preinit (&ripd_di, argc, argv);
frr_opt_add ("r", longopts,
" -r, --retain When program terminates, retain added route by ripd.\n");
@@ -189,16 +187,7 @@ main (int argc, char **argv)
rip_peer_init ();
frr_config_fork ();
-
- /* Create VTY's socket */
- frr_vty_serv ();
-
- /* Print banner. */
- zlog_notice ("RIPd %s starting: vty@%d", FRR_VERSION, ripd_di.vty_port);
-
- /* Execute each thread. */
- while (thread_fetch (master, &thread))
- thread_call (&thread);
+ frr_run (master);
/* Not reached. */
return (0);