Merge pull request #14811 from donaldsharp/zebra_final_shutdown_finally

Zebra final shutdown finally

1 files changed, 11 insertions, 3 deletions

diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 7fca365468..e42c28985a 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -4034,10 +4034,12 @@ void zebra_mpls_turned_on(void)
 	if (!mpls_enabled) {
 		mpls_processq_init();
 		mpls_enabled = true;
-	}
 
-	hook_register(zserv_client_close, zebra_mpls_cleanup_fecs_for_client);
-	hook_register(zserv_client_close, zebra_mpls_cleanup_zclient_labels);
+		hook_register(zserv_client_close,
+			      zebra_mpls_cleanup_fecs_for_client);
+		hook_register(zserv_client_close,
+			      zebra_mpls_cleanup_zclient_labels);
+	}
 }
 
 /*
@@ -4056,3 +4058,9 @@ void zebra_mpls_init(void)
 
 	zebra_mpls_turned_on();
 }
+
+void zebra_mpls_terminate(void)
+{
+	hook_unregister(zserv_client_close, zebra_mpls_cleanup_fecs_for_client);
+	hook_unregister(zserv_client_close, zebra_mpls_cleanup_zclient_labels);
+}