ospfd: Cleanup route-map memory

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index dd000241f4035714fa9c886c63fb91c6baff04a4..a2a1c4a94f22189219792682028742085958b0bf 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -89,6 +89,7 @@ static void sigint(void)
        zlog_notice("Terminating on signal");
        bfd_protocol_integration_set_shutdown(true);
        ospf_terminate();
+
        exit(0);
 }
 

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 9ed1d301f50a8ca90f2ca36895a392c39b988fb7..c46d2e278e319b701684e2198c29ef04ce8ef2b6 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -595,6 +595,7 @@ static void ospf_deferred_shutdown_finish(struct ospf *ospf)
        /* ospfd being shut-down? If so, was this the last ospf instance? */
        if (CHECK_FLAG(om->options, OSPF_MASTER_SHUTDOWN)
            && (listcount(om->ospf) == 0)) {
+               route_map_finish();
                frr_fini();
                exit(0);
        }
@@ -678,6 +679,7 @@ void ospf_terminate(void)
        /* Cleanup vrf info */
        ospf_vrf_terminate();
 
+       route_map_finish();
        /* Deliberately go back up, hopefully to thread scheduler, as
         * One or more ospf_finish()'s may have deferred shutdown to a timer
         * thread