isisd: Tie isis into cleaning up affinity maps

Affinity maps are abeing leaked.  STOP

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

diff --git a/isisd/isis_affinitymap.c b/isisd/isis_affinitymap.c
index 595091db2727dcc661d6a6d9bbfa3312b4661f89..a6b9cf9d4cb32003e74826d7a5313b5172c78dbb 100644 (file)
--- a/isisd/isis_affinitymap.c
+++ b/isisd/isis_affinitymap.c
@@ -64,4 +64,8 @@ void isis_affinity_map_init(void)
        affinity_map_set_update_hook(isis_affinity_map_update);
 }
 
+void isis_affinity_map_terminate(void)
+{
+       affinity_map_terminate();
+}
 #endif /* ifndef FABRICD */

diff --git a/isisd/isis_affinitymap.h b/isisd/isis_affinitymap.h
index c432e99f51eb30edbc8175d3b6d907064b68e607..525ee0467abcbded466d31bb571bb0f3a091b251 100644 (file)
--- a/isisd/isis_affinitymap.h
+++ b/isisd/isis_affinitymap.h
@@ -15,6 +15,7 @@ extern "C" {
 #endif
 
 extern void isis_affinity_map_init(void);
+extern void isis_affinity_map_terminate(void);
 
 #ifdef __cplusplus
 }

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index e303a98f2fd80e7153e33ab913e21711e05c69e0..c36c531a171ca49e97f7682e08e6508cdbe0d8bd 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -110,6 +110,9 @@ static __attribute__((__noreturn__)) void terminate(int i)
        isis_master_terminate();
        route_map_finish();
        prefix_list_reset();
+#ifndef FABRICD
+       isis_affinity_map_terminate();
+#endif
        vrf_terminate();
 
        frr_fini();