bfdd: Free zclient memory on shutdown

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

diff --git a/bfdd/bfd.h b/bfdd/bfd.h
index 6c5a1e921618a755461cbc672adb2372f270e94c..d5a9f92cf73c75d19068136a6dffa7f191757847 100644 (file)
--- a/bfdd/bfd.h
+++ b/bfdd/bfd.h
@@ -782,6 +782,7 @@ void bfdd_cli_init(void);
  */
 void bfdd_zclient_init(struct zebra_privs_t *bfdd_priv);
 void bfdd_zclient_stop(void);
+void bfdd_zclient_terminate(void);
 void bfdd_zclient_unregister(vrf_id_t vrf_id);
 void bfdd_zclient_register(vrf_id_t vrf_id);
 void bfdd_sessions_enable_vrf(struct vrf *vrf);

diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index 95066b97ce71f949b36c7f075ca2f8792777a8c0..71055c32ed65dede72914b984486e6d37b6e44d7 100644 (file)
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -75,6 +75,8 @@ static void sigterm_handler(void)
 
        bfd_vrf_terminate();
 
+       bfdd_zclient_terminate();
+
        /* Terminate and free() FRR related memory. */
        frr_fini();
 

diff --git a/bfdd/ptm_adapter.c b/bfdd/ptm_adapter.c
index e6c2fb71f0cf2accd4cd2186a73da062a3dbd8f9..b5ab2ef1d0dbcbcc4a1dde031a10bf51561bffe2 100644 (file)
--- a/bfdd/ptm_adapter.c
+++ b/bfdd/ptm_adapter.c
@@ -859,6 +859,11 @@ void bfdd_zclient_stop(void)
        pc_free_all();
 }
 
+void bfdd_zclient_terminate(void)
+{
+       zclient_free(zclient);
+}
+
 
 /*
  * Client handling.