diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-11 10:06:29 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-11 10:06:29 -0700 |
| commit | 732ebcdfad6e3a786386e38a126c84477d192105 (patch) | |
| tree | f779d9e4880d0206d4a61026f9d1deddaf5d08f5 | |
| parent | 6f3f12558cb654ec7fcb3004fb8c7dbee7b84dc4 (diff) | |
| download | quagga-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.
| -rw-r--r-- | bgpd/bgp_route.c | 12 | ||||
| -rw-r--r-- | bgpd/bgp_route.h | 1 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 2 |
3 files changed, 15 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) diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h index 3e65bb10..02193ba9 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -171,6 +171,7 @@ extern void bgp_soft_reconfig_rsclient (struct peer *, afi_t, safi_t); extern void bgp_check_local_routes_rsclient (struct peer *rsclient, afi_t afi, safi_t safi); extern void bgp_clear_route (struct peer *, afi_t, safi_t); extern void bgp_clear_route_all (struct peer *); +extern void bgp_clear_route_wait (struct peer *); extern void bgp_clear_adj_in (struct peer *, afi_t, safi_t); extern void bgp_clear_stale_route (struct peer *, afi_t, safi_t); diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index f1d78389..af2f15e4 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1133,6 +1133,8 @@ peer_delete (struct peer *peer) bgp_timer_set (peer); /* stops all timers for Deleted */ + bgp_clear_route_wait (peer); + /* Delete from all peer list. */ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP)) { |