diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2014-03-18 17:04:25 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2014-03-18 17:04:25 +0100 |
| commit | e708ed69aa0b993527f48b1f31b645c00750927f (patch) | |
| tree | 8f33d73b2a85b51c042318d58a1750eeb8019616 /ospf6d/ospf6_main.c | |
| parent | a11e012e8661629d665e992e765741a5eaa7d017 (diff) | |
| parent | 424cc3bd48da0f417c9056c5c2ade697a3386cd4 (diff) | |
| download | quagga-e708ed69aa0b993527f48b1f31b645c00750927f.tar.bz2 quagga-e708ed69aa0b993527f48b1f31b645c00750927f.tar.xz | |
Merge volatile/cumulus_ospf6d
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, 8 insertions, 2 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 17d7654e..e9919713 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -41,6 +41,8 @@ #include "ospf6_message.h" #include "ospf6_asbr.h" #include "ospf6_lsa.h" +#include "ospf6_interface.h" +#include "ospf6_zebra.h" /* Default configuration file name for ospf6d. */ #define OSPF6_DEFAULT_CONFIG "ospf6d.conf" @@ -134,12 +136,16 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); static void __attribute__ ((noreturn)) ospf6_exit (int status) { - extern struct ospf6 *ospf6; - extern struct zclient *zclient; + struct listnode *node; + struct interface *ifp; if (ospf6) ospf6_delete (ospf6); + for (ALL_LIST_ELEMENTS_RO(iflist, node, ifp)) + if (ifp->info != NULL) + ospf6_interface_delete(ifp->info); + ospf6_message_terminate (); ospf6_asbr_terminate (); ospf6_lsa_terminate (); |