diff options
| author | paulo <paul@bayleaf.org.uk> | 2010-02-05 10:15:52 +0000 |
|---|---|---|
| committer | paulo <paul@bayleaf.org.uk> | 2010-02-05 10:15:52 +0000 |
| commit | c751ea18005633ceac54cf7415147e04adb19cb5 (patch) | |
| tree | 4b66e1c8b44680e10652790e3eb2fbd718d2940f /bgpd/bgp_route.c | |
| parent | 4b2c10c2f5c483c7e6f9a8007a6f09acb7fcaf6b (diff) | |
| download | quagga-c751ea18005633ceac54cf7415147e04adb19cb5.tar.bz2 quagga-c751ea18005633ceac54cf7415147e04adb19cb5.tar.xz | |
Fixed shutdown. Centralized the testing of whether the session can be
enabled in bgp_peer_enable. Added belt and braces notify in
bgp_terminate after setting the SHUTDOWN flag, which should send the
notify itself.
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 3e2b54a3..7d3ad901 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2730,11 +2730,8 @@ bgp_clear_node_complete (struct work_queue *wq) if (peer->state == bgp_peer_sClearing) { peer_change_status (peer, bgp_peer_sIdle); - /* enable peer if required */ - if (!CHECK_FLAG (peer->flags, PEER_FLAG_SHUTDOWN) && - !CHECK_FLAG (peer->sflags, PEER_STATUS_PREFIX_OVERFLOW)) - bgp_peer_enable(peer); + bgp_peer_enable(peer); } peer_unlock (peer); /* bgp_clear_route */ |