From 65ca75e0d1e7e440bf0d2a6a031d4148024c9d12 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Thu, 4 May 2006 08:08:15 +0000 Subject: [bgpd] Fix bug where FSM can stay hung forever in Idle/Clrng 2006-05-04 Paul Jakma * bgp_route.c: (general) Fix logical bug in clearing, noted by Chris Caputo in [quagga-users 6728] - clearing depended on at least one route being added to workqueue, in order for workqueue completion function to restart FSM. However, if no routes are cleared, then the completion function never is called, it needs to be called manually if the workqueue didn't get scheduled. Finally, clearing is per-peer-session, not per AFI/SAFI, so the FSM synchronisation should be in bgp_clear_route_table. (bgp_clear_route_table) Wrong place for FSM/clearing synchronisation, move to.. (bgp_clear_route) FSM/clearing synchronisation should be here. If no routes were cleared, no workqueue scheduled, call the completion func to ensure FSM kicks off again. --- bgpd/ChangeLog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'bgpd/ChangeLog') diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog index a0ba520c..5599801e 100644 --- a/bgpd/ChangeLog +++ b/bgpd/ChangeLog @@ -7,6 +7,21 @@ * bgp_packet.c: (bgp_{update,withdraw}_packet) Enable some VPNv4 code which inexplicably was ifdef'd out. comments from a tester on IRC suggest this fixes bug #210. + * bgp_route.c: (general) Fix logical bug in clearing, noted + by Chris Caputo in [quagga-users 6728] - clearing depended on + at least one route being added to workqueue, in order for + workqueue completion function to restart FSM. However, if no + routes are cleared, then the completion function never is + called, it needs to be called manually if the workqueue + didn't get scheduled. + Finally, clearing is per-peer-session, not per AFI/SAFI, so + the FSM synchronisation should be in bgp_clear_route_table. + (bgp_clear_route_table) Wrong place for FSM/clearing + synchronisation, move to.. + (bgp_clear_route) FSM/clearing synchronisation should be + here. + If no routes were cleared, no workqueue scheduled, call + the completion func to ensure FSM kicks off again. 2006-03-30 Paul Jakma -- cgit v1.2.1