summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_route.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-11 10:06:29 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-11 10:06:29 -0700
commit732ebcdfad6e3a786386e38a126c84477d192105 (patch)
treef779d9e4880d0206d4a61026f9d1deddaf5d08f5 /bgpd/bgp_route.c
parent6f3f12558cb654ec7fcb3004fb8c7dbee7b84dc4 (diff)
downloadquagga-732ebcdfad6e3a786386e38a126c84477d192105.tar.bz2
quagga-732ebcdfad6e3a786386e38a126c84477d192105.tar.xz
Wait for peers to clear on BGP shutdown
Bugfix 3436 Wait for all items in the peer clear queue to finish before deleting BGP instance.
Diffstat (limited to 'bgpd/bgp_route.c')
-rw-r--r--bgpd/bgp_route.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 6da17d9b..4e172bf8 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2670,6 +2670,18 @@ bgp_clear_node_queue_init (struct peer *peer)
peer->clear_node_queue->spec.data = peer;
}
+/* Route clearing may not be done yet.
+ * Otherwise events in peer->clear_node_queue could happen after bgp is freed.
+ */
+void
+bgp_clear_route_wait (struct peer *peer)
+{
+ struct work_queue *wq = peer->clear_node_queue;
+
+ while (listcount (wq->items) > 0)
+ work_queue_run(wq->thread);
+}
+
static void
bgp_clear_route_table (struct peer *peer, afi_t afi, safi_t safi,
struct bgp_table *table, struct peer *rsclient)