diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-12-06 19:30:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 19:30:18 -0500 |
| commit | 3b2298e76b8e641ffda98705cc973f28a5735bb4 (patch) | |
| tree | 69e598da78c13b7091d06a2cc79a51b39c203b35 | |
| parent | 0ac151ab449a6a56b36c34429f4a2e0634e6e283 (diff) | |
| parent | 0768f289e09e309ad6b5c0ac4c92dd71246eb3ed (diff) | |
Merge pull request #3421 from pguibert6WIND/bgp_lp_finish_called_too_early
bgpd: delay destruction of label pool
| -rw-r--r-- | bgpd/bgp_main.c | 3 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index f8ff4f2f07..47e7c1686f 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -235,6 +235,9 @@ static __attribute__((__noreturn__)) void bgp_exit(int status) bf_free(bm->rd_idspace); list_delete(&bm->bgp); + + bgp_lp_finish(); + memset(bm, 0, sizeof(*bm)); frr_fini(); diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 94cb285a03..d6be3228fe 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -7963,5 +7963,4 @@ void bgp_terminate(void) if (bm->t_rmap_update) BGP_TIMER_OFF(bm->t_rmap_update); - bgp_lp_finish(); } |