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 /isisd | |
| 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 'isisd')
| -rw-r--r-- | isisd/isis_main.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 49b988b29..8c48c7e27 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -198,7 +198,6 @@ int main (int argc, char **argv, char **envp) { int opt; - struct thread thread; /* for reload */ _argc = argc; @@ -259,16 +258,7 @@ main (int argc, char **argv, char **envp) isis_zebra_init(master); frr_config_fork (); - - /* Make isis vty socket. */ - frr_vty_serv (); - - /* Print banner. */ - zlog_notice ("Quagga-ISISd %s starting: vty@%d", FRR_VERSION, isisd_di.vty_port); - - /* Start finite state machine. */ - while (thread_fetch (master, &thread)) - thread_call (&thread); + frr_run (master); /* Not reached. */ exit (0); |