diff options
| author | Christian Hopps <chopps@labn.net> | 2023-11-28 20:14:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 20:14:42 +0100 |
| commit | bb6fe6beb9dc5ca891e064576644be0fd160da15 (patch) | |
| tree | 0243d6c552c5cf169c701ce10613698f15894dfe /bfdd | |
| parent | Merge pull request #14856 from opensourcerouting/show-rm (diff) | |
| parent | zebra: Cleanup zrouter.stale_client_list on shutdown (diff) | |
| download | frr-bb6fe6beb9dc5ca891e064576644be0fd160da15.tar.xz frr-bb6fe6beb9dc5ca891e064576644be0fd160da15.zip | |
Merge pull request #14811 from donaldsharp/zebra_final_shutdown_finally
Zebra final shutdown finally
Diffstat (limited to 'bfdd')
| -rw-r--r-- | bfdd/bfd.h | 1 | ||||
| -rw-r--r-- | bfdd/bfdd.c | 2 | ||||
| -rw-r--r-- | bfdd/ptm_adapter.c | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/bfdd/bfd.h b/bfdd/bfd.h index 7f3f491a6..26bd20b5d 100644 --- 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 95066b97c..71055c32e 100644 --- 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 e6c2fb71f..b5ab2ef1d 100644 --- 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. |