ospfd: fix GR helper initialization and termination

Since a single ospfd process can have multiple OSPF interfaces
configured, we need to separate the global GR initialization and
termination from per-instance initialization and termination.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 38c0ca2b6..106ce3bd7 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -386,7 +386,7 @@ struct ospf *ospf_new_alloc(unsigned short instance, const char *name)
 
 	new->proactive_arp = OSPF_PROACTIVE_ARP_DEFAULT;
 
-	ospf_gr_helper_init(new);
+	ospf_gr_helper_instance_init(new);
 
 	ospf_asbr_external_aggregator_init(new);
 
@@ -651,6 +651,9 @@ void ospf_terminate(void)
 	for (ALL_LIST_ELEMENTS(om->ospf, node, nnode, ospf))
 		ospf_finish(ospf);
 
+	/* Cleanup GR */
+	ospf_gr_helper_stop();
+
 	/* Cleanup route maps */
 	route_map_finish();
 
@@ -900,7 +903,7 @@ static void ospf_finish_final(struct ospf *ospf)
 	list_delete(&ospf->oi_write_q);
 
 	/* Reset GR helper data structers */
-	ospf_gr_helper_stop(ospf);
+	ospf_gr_helper_instance_stop(ospf);
 
 	close(ospf->fd);
 	stream_free(ospf->ibuf);