[quagga-dev 12305] [PATCH 4/5] bgpd: kill update-delay timers in bgp_delete()

David Lamparter equinox at opensourcerouting.org
Thu May 14 22:02:49 BST 2015


The t_startup timer had the same bug - it kept running after a
bgp_delete.  Thus, "router bgp 23456" immediately followed by "no router
bgp 23456" would cause the timer to run on a deleted bgp object.

Untested.

Not-signed-off-by: David Lamparter <equinox at opensourcerouting.org>
---
 bgpd/bgpd.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 70a64c9..14b013f 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2089,6 +2089,9 @@ bgp_delete (struct bgp *bgp)
   afi_t afi;
   int i;
 
+  THREAD_OFF (bgp->t_update_delay);
+  THREAD_OFF (bgp->t_establish_wait);
+
   /* Delete static route. */
   bgp_static_delete (bgp);
 
-- 
2.0.4





More information about the Quagga-dev mailing list