ospfd: Stop and free synchronous Zebra client on OSPF termination

Signed-off-by: Donatas Abraitis <[email protected]>
opensourcerouting · Jun 26, 2023 · a9c81cc · a9c81cc
1 parent 4262dc3
commit a9c81cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
@@ -47,7 +47,7 @@ DEFINE_MTYPE_STATIC(OSPFD, OSPF_REDISTRIBUTE, "OSPF Redistriute");
 /* Zebra structure to hold current status. */
 struct zclient *zclient = NULL;
 /* and for the Synchronous connection to the Label Manager */
-static struct zclient *zclient_sync;
+struct zclient *zclient_sync;
 
 /* For registering threads. */
 extern struct event_loop *master;

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
@@ -60,6 +60,7 @@ struct ospf_master *om;
 unsigned short ospf_instance;
 
 extern struct zclient *zclient;
+extern struct zclient *zclient_sync;
 
 
 static void ospf_remove_vls_through_area(struct ospf *, struct ospf_area *);
@@ -681,6 +682,8 @@ void ospf_terminate(void)
 	 */
 	zclient_stop(zclient);
 	zclient_free(zclient);
+	zclient_stop(zclient_sync);
+	zclient_free(zclient_sync);
 
 done:
 	frr_fini();