Merge pull request #4891 from donaldsharp/bgp_keepalives

bgpd: Shut off keepalives as soon as we shutdown a peer

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index b5f267cc3862221124651cfd7351a0212ff13ab7..fed8cd4d86bb5c750895f9f4df417a34b8703989 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2221,10 +2221,12 @@ int peer_delete(struct peer *peer)
        bgp = peer->bgp;
        accept_peer = CHECK_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER);
 
+       bgp_keepalives_off(peer);
        bgp_reads_off(peer);
        bgp_writes_off(peer);
        assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_WRITES_ON));
        assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_READS_ON));
+       assert(!CHECK_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON));
 
        if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT))
                peer_nsf_stop(peer);