Merge pull request #5789 from donaldsharp/bgp_ebgp_reason

[mirror_frr.git] / zebra / zebra_router.c

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index b85319df735af361983d20db83740065d2cc159f..a891ffb76a2453c226039c7cb9e1f3a3ea3653c2 100644 (file)
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -154,6 +154,11 @@ void zebra_router_sweep_route(void)
        }
 }
 
+void zebra_router_sweep_nhgs(void)
+{
+       zebra_nhg_sweep_table(zrouter.nhgs_id);
+}
+
 static void zebra_router_free_table(struct zebra_router_table *zrt)
 {
        void *table_info;
@@ -218,7 +223,7 @@ void zebra_router_terminate(void)
        zebra_vxlan_disable();
        zebra_mlag_terminate();
 
-       hash_clean(zrouter.nhgs, zebra_nhg_free);
+       hash_clean(zrouter.nhgs, zebra_nhg_hash_free);
        hash_free(zrouter.nhgs);
        hash_clean(zrouter.nhgs_id, NULL);
        hash_free(zrouter.nhgs_id);
@@ -240,6 +245,8 @@ void zebra_router_init(void)
 
        zrouter.packets_to_process = ZEBRA_ZAPI_PACKETS_TO_PROCESS;
 
+       zrouter.rtadv_sock = -1;
+
        zebra_vxlan_init();
        zebra_mlag_init();
 
@@ -266,14 +273,3 @@ void zebra_router_init(void)
                hash_create_size(8, zebra_nhg_id_key, zebra_nhg_hash_id_equal,
                                 "Zebra Router Nexthop Groups ID index");
 }
-
-/**
- * zebra_router_cleanup() - Perform any cleanup actions before termination
- *
- * Right now this is just being used to clear the nexthops we installed in
- * the kernel on shutdown before the routes are cleaned via vrf_terminated().
- */
-void zebra_router_cleanup(void)
-{
-       zebra_nhg_cleanup_tables();
-}