zebra: fix assert mpls when terminating zebra

The assert appears in zebra_mpls.c when checking default zebra_vrf.
It appears that when the mpls entries are flushed, it gets the default
vrf which is already flushed by vrf_terminate() function. In order to
avoid that assert to trigger a crash, the mpls flush is called before
vrf termination.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/zebra/main.c b/zebra/main.c
index 335329081617a52550a463804270d6631dc63cc0..9cad913f4bef95ccc066893f27fb538ecd662487 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -138,6 +138,8 @@ static void sigint(void)
                        if (zvrf)
                                SET_FLAG(zvrf->flags, ZEBRA_VRF_RETAIN);
                }
+       if (zebrad.lsp_process_q)
+               work_queue_free(zebrad.lsp_process_q);
        vrf_terminate();
 
        ns_walk_func(zebra_ns_disabled);
@@ -149,8 +151,6 @@ static void sigint(void)
 
        list_delete_and_null(&zebrad.client_list);
        work_queue_free(zebrad.ribq);
-       if (zebrad.lsp_process_q)
-               work_queue_free(zebrad.lsp_process_q);
        meta_queue_free(zebrad.mq);
 
        frr_fini();