summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaulo <paul@bayleaf.org.uk>2010-02-03 16:50:04 +0000
committerpaulo <paul@bayleaf.org.uk>2010-02-03 16:50:04 +0000
commitc74710ae84aa3377f44293750ce98313903623e6 (patch)
treef497ae3d74ff6edc392723cbc7e4cfc297f06db7
parent9c2e47cd3f3018aa5508cd5e7c0d60067cadddbf (diff)
downloadquagga-c74710ae84aa3377f44293750ce98313903623e6.tar.bz2
quagga-c74710ae84aa3377f44293750ce98313903623e6.tar.xz
When prefix overflow timer expires it mustn't re-enable the peer if we
are still clearing.
-rw-r--r--bgpd/bgpd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 5dc34c49..4a1faa19 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3841,6 +3841,10 @@ peer_clear (struct peer *peer)
zlog_debug ("%s Maximum-prefix restart timer cancelled",
peer->host);
}
+
+ /* Beware we may still be clearing, if so the end of
+ * clearing will enable the peer */
+ if (peer->state == bgp_peer_sIdle)
bgp_peer_enable(peer);
return 0;