Merge pull request #14811 from donaldsharp/zebra_final_shutdown_finally

Zebra final shutdown finally

1 files changed, 5 insertions, 1 deletions

diff --git a/zebra/main.c b/zebra/main.c
index aea30daa3b..1efb27db06 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -196,6 +196,7 @@ static void sigint(void)
 	rib_update_finish();
 
 	list_delete(&zrouter.client_list);
+	list_delete(&zrouter.stale_client_list);
 
 	/* Indicate that all new dplane work has been enqueued. When that
 	 * work is complete, the dataplane will enqueue an event
@@ -228,8 +229,11 @@ void zebra_finalize(struct event *dummy)
 	/* Final shutdown of ns resources */
 	ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);
 
+	zebra_rib_terminate();
 	zebra_router_terminate();
 
+	zebra_mpls_terminate();
+
 	ns_terminate();
 	frr_fini();
 	exit(0);
@@ -410,7 +414,7 @@ int main(int argc, char **argv)
 	/* Zebra related initialize. */
 	zebra_router_init(asic_offload, notify_on_ack, v6_with_v4_nexthop);
 	zserv_init();
-	rib_init();
+	zebra_rib_init();
 	zebra_if_init();
 	zebra_debug_init();