diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-09-02 00:53:59 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-09-02 00:53:59 +0100 |
| commit | 3690074a486cfada568975e287d9cbb9e687501f (patch) | |
| tree | f6394c1ab1ca8381e9a77acca84f03dc701d10b2 /bgpd/bgp_peer.c | |
| parent | 3f515315d5b17e432453eef67d7ac9e27bc39461 (diff) | |
| download | quagga-3690074a486cfada568975e287d9cbb9e687501f.tar.bz2 quagga-3690074a486cfada568975e287d9cbb9e687501f.tar.xz | |
Merging of euro_ix branch into pipework.
Bring in fixes for bgp dumping with pthreaded BGP Engine.
Bring in new "show nexus xxx" command.
Fix removal of '~' prompt.
Diffstat (limited to 'bgpd/bgp_peer.c')
| -rw-r--r-- | bgpd/bgp_peer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bgpd/bgp_peer.c b/bgpd/bgp_peer.c index 196f0d54..f07a30f5 100644 --- a/bgpd/bgp_peer.c +++ b/bgpd/bgp_peer.c @@ -35,7 +35,6 @@ #include "bgpd/bgp_packet.h" #include "bgpd/bgp_network.h" #include "bgpd/bgp_route.h" -#include "bgpd/bgp_dump.h" #include "bgpd/bgp_open.h" #include "bgpd/bgp_advertise.h" @@ -1595,7 +1594,8 @@ bgp_peer_clearing_completed(struct peer *peer) /*------------------------------------------------------------------------------ * Set new peer state. * - * If state changes, do dump new state and log state change if required. + * If state changes log state change if required and deal with dropping back to + * pIdle. * * In any case, set timers for the new state -- so if state hasn't changed, * will restart those timers. @@ -1605,8 +1605,6 @@ bgp_peer_change_status (bgp_peer peer, bgp_peer_state_t new_state) { if (peer->state != new_state) { - bgp_dump_state (peer, peer->state, new_state); - /* Preserve old status and change into new status. */ peer->ostate = peer->state ; peer->state = new_state ; |