From: Igor Ryzhov <iryzhov@nfware.com>
Date: Fri, 20 Nov 2020 03:06:51 +0000 (+0300)
Subject: ospf6: move serv_close to ospf6_delete
X-Git-Tag: base_7.6~175^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d31369905822311828832c13f7f5a2dbe116f965;p=matthieu%2Ffrr.git

ospf6: move serv_close to ospf6_delete

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 4ed6e2a604..69424f4b46 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -88,12 +88,11 @@ static void __attribute__((noreturn)) ospf6_exit(int status)
 
 	for (ALL_LIST_ELEMENTS(om6->ospf6, node, nnode, ospf6)) {
 		vrf = vrf_lookup_by_id(ospf6->vrf_id);
-		ospf6_serv_close(&ospf6->fd);
+		ospf6_delete(ospf6);
+		ospf6 = NULL;
 		FOR_ALL_INTERFACES (vrf, ifp)
 			if (ifp->info != NULL)
 				ospf6_interface_delete(ifp->info);
-		ospf6_delete(ospf6);
-		ospf6 = NULL;
 	}
 
 	bfd_gbl_exit();
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 97002145b0..908cda43d0 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -302,6 +302,8 @@ void ospf6_delete(struct ospf6 *o)
 	ospf6_disable(o);
 	ospf6_del(o);
 
+	ospf6_serv_close(&o->fd);
+
 	for (ALL_LIST_ELEMENTS(o->area_list, node, nnode, oa))
 		ospf6_area_delete(oa);
 
@@ -458,7 +460,6 @@ DEFUN (no_router_ospf6,
 	if (ospf6 == NULL)
 		vty_out(vty, "OSPFv3 is not configured\n");
 	else {
-		ospf6_serv_close(&ospf6->fd);
 		ospf6_delete(ospf6);
 		ospf6 = NULL;
 	}