ospf6d: improve ordered shutdown
Improve the _disable/_enable infrastructure so it gets into
a more usable shape and make 'no router ospf6' actually work.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 17d7654..e991971 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 @@
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 ();