summaryrefslogtreecommitdiff
path: root/bgpd/bgp_fsm.c
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2008-08-26 14:33:28 +0100
committerPaul Jakma <paul@quagga.net>2008-08-26 14:33:28 +0100
commit6556d8a04079eb54d1805df3bef3e66ff1267d02 (patch)
tree35b35c8f7fbad9e6622ab8adfd9f5d71e2cfc541 /bgpd/bgp_fsm.c
parentb38309a4ee831a440ef78f8a27db584f2f8e8276 (diff)
Revert "[bgpd] Add 'bgp open-accept' option, to send OPEN immediately on accepted conns"
Revert commit d664ae1182c29b74b409bc8594b7bd0575e91ce9. An experimental patch which violates RFC4271 quite badly, but managed to accidently sneak its way in.
Diffstat (limited to 'bgpd/bgp_fsm.c')
-rw-r--r--bgpd/bgp_fsm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index df1cfb7b..15bd8a6c 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -616,8 +616,7 @@ bgp_connect_success (struct peer *peer)
zlog_debug ("%s passive open", peer->host);
}
- if (!CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER)
- || bgp_option_check (BGP_OPT_ALWAYS_OPEN))
+ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER))
bgp_open_send (peer);
return 0;