diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-06 08:28:16 +0200 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-15 13:25:44 +0200 |
commit | 03951374770da5be620e48768588928fbd809c83 (patch) | |
tree | e2234dd2ace2aa632646729dc5956901426d7f19 /ospf6d/ospf6_main.c | |
parent | lib: hooks: support priority ordering & reversing (diff) | |
download | frr-03951374770da5be620e48768588928fbd809c83.tar.xz frr-03951374770da5be620e48768588928fbd809c83.zip |
*: centralize some exit cleanup into libfrr
Start creating a counterpart to frr_init and frr_late_init.
Unfortunately, some daemons don't do any exit handling, this doesn't
change that just yet.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_main.c')
-rw-r--r-- | ospf6d/ospf6_main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 28bb956c4..e582737f9 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -82,6 +82,8 @@ static void __attribute__((noreturn)) ospf6_exit(int status) struct listnode *node; struct interface *ifp; + frr_early_fini(); + if (ospf6) ospf6_delete(ospf6); @@ -96,19 +98,13 @@ static void __attribute__((noreturn)) ospf6_exit(int status) ospf6_lsa_terminate(); vrf_terminate(); - vty_terminate(); - cmd_terminate(); if (zclient) { zclient_stop(zclient); zclient_free(zclient); } - if (master) - thread_master_free(master); - - closezlog(); - + frr_fini(); exit(status); } |