From dcdf399fbc7420d3edc230c9646f720825fcecda Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Sun, 15 Oct 2006 23:39:59 +0000 Subject: [bgpd] Bug #302 fixes. ClearingCompleted event gets flushed, leaving peers stuck in Clearing. 2006-10-14 Paul Jakma * bgp_fsm.h: Remove BGP_EVENT_FLUSH_ADD, dangerous and not needed. * bgp_fsm.c: (bgp_stop) Move BGP_EVENT_FLUSH to the top of the of the function, otherwise it could flush a ClearingCompleted event, bug #302. * bgp_packet.c: Replace all BGP_EVENT_FLUSH_ADD with BGP_EVENT_ADD, fixing bug #302. --- bgpd/bgp_fsm.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'bgpd/bgp_fsm.h') diff --git a/bgpd/bgp_fsm.h b/bgpd/bgp_fsm.h index c51bed37..a749f8ea 100644 --- a/bgpd/bgp_fsm.h +++ b/bgpd/bgp_fsm.h @@ -71,12 +71,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA thread_cancel_event (master, (P)); \ } while (0) -#define BGP_EVENT_FLUSH_ADD(P,E) \ - do { \ - BGP_EVENT_FLUSH(P); \ - BGP_EVENT_ADD(P,E); \ - } while (0) - /* Prototypes. */ extern int bgp_event (struct thread *); extern int bgp_stop (struct peer *peer); -- cgit v1.2.1