ldpd: Stop and free synchronous Zebra client on destroy

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
FRRouting · Jun 27, 2023 · a5c9e19 · a5c9e19
1 parent 93ffc5a
commit a5c9e19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ldpd/lde.c b/ldpd/lde.c
@@ -87,7 +87,7 @@ static struct list *label_chunk_list;
 static struct listnode *current_label_chunk;
 
 /* Synchronous zclient to request labels */
-static struct zclient *zclient_sync;
+struct zclient *zclient_sync;
 
 /* SIGINT / SIGTERM handler. */
 static void

diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c
@@ -39,6 +39,7 @@ static int 	ldp_zebra_opaque_msg_handler(ZAPI_CALLBACK_ARGS);
 static void 	ldp_sync_zebra_init(void);
 
 static struct zclient	*zclient;
+extern struct zclient *zclient_sync;
 static bool zebra_registered = false;
 
 static void
@@ -703,4 +704,10 @@ ldp_zebra_destroy(void)
 	zclient_stop(zclient);
 	zclient_free(zclient);
 	zclient = NULL;
+
+	if (zclient_sync == NULL)
+		return;
+	zclient_stop(zclient_sync);
+	zclient_free(zclient_sync);
+	zclient_sync = NULL;
 }