From 845d9af76acda1983fc7dca07598df17d1dab610 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 11 May 2018 13:57:13 -0400 Subject: [PATCH] pimd: Cleanup msdp shutdown Shutdown pim msdp code a bit better. Signed-off-by: Donald Sharp --- pimd/pim_msdp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 829c917b0f..7afc37a28e 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -1176,8 +1176,7 @@ static void pim_msdp_peer_free(struct pim_msdp_peer *mp) * Let's make sure we are not running when we delete * the underlying data structure */ - pim_msdp_peer_cr_timer_setup(mp, false); - pim_msdp_peer_ka_timer_setup(mp, false); + pim_msdp_peer_stop_tcp_conn(mp, false); if (mp->ibuf) { stream_free(mp->ibuf); @@ -1190,6 +1189,8 @@ static void pim_msdp_peer_free(struct pim_msdp_peer *mp) if (mp->mesh_group_name) { XFREE(MTYPE_PIM_MSDP_MG_NAME, mp->mesh_group_name); } + + mp->pim = NULL; XFREE(MTYPE_PIM_MSDP_PEER, mp); } -- 2.39.5