]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Cleanup msdp shutdown
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 11 May 2018 17:57:13 +0000 (13:57 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 11 May 2018 22:36:24 +0000 (18:36 -0400)
Shutdown pim msdp code a bit better.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_msdp.c

index 829c917b0f36483fdca475cedd7e2149293316b8..7afc37a28e74a763592edd97e1060d83b6b9da59 100644 (file)
@@ -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);
 }