Revert "[bgpd] Add 'bgp open-accept' option, to send OPEN immediately on accepted conns"

Revert commit d664ae1182. An experimental
patch which violates RFC4271 quite badly, but managed to accidently sneak
its way in.
This commit is contained in:
Paul Jakma 2008-08-26 14:33:28 +01:00 committed by Paul Jakma
parent b38309a4ee
commit 6556d8a040
4 changed files with 1 additions and 38 deletions

View File

@ -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;

View File

@ -279,28 +279,6 @@ DEFUN (no_bgp_config_type,
return CMD_SUCCESS;
}
DEFUN_HIDDEN (bgp_open_accept,
bgp_open_accept_cmd,
"bgp open-accept",
BGP_STR
"Send OPEN immediately on accepted connections\n")
{
bgp_option_set (BGP_OPT_ALWAYS_OPEN);
return CMD_SUCCESS;
}
DEFUN_HIDDEN (no_bgp_open_accept,
no_bgp_open_accept_cmd,
"no bgp open-accept",
NO_STR
BGP_STR
"Send OPEN immediately on accepted connections\n")
{
bgp_option_unset (BGP_OPT_ALWAYS_OPEN);
return CMD_SUCCESS;
}
DEFUN (no_synchronization,
no_synchronization_cmd,
"no synchronization",
@ -8842,10 +8820,6 @@ bgp_vty_init (void)
install_element (CONFIG_NODE, &bgp_config_type_cmd);
install_element (CONFIG_NODE, &no_bgp_config_type_cmd);
/* "bgp open-all" commands. */
install_element (CONFIG_NODE, &bgp_open_accept_cmd);
install_element (CONFIG_NODE, &no_bgp_open_accept_cmd);
/* Dummy commands (Currently not supported) */
install_element (BGP_NODE, &no_synchronization_cmd);
install_element (BGP_NODE, &no_auto_summary_cmd);

View File

@ -81,7 +81,6 @@ bgp_option_set (int flag)
case BGP_OPT_NO_FIB:
case BGP_OPT_MULTIPLE_INSTANCE:
case BGP_OPT_CONFIG_CISCO:
case BGP_OPT_ALWAYS_OPEN:
SET_FLAG (bm->options, flag);
break;
default:
@ -101,7 +100,6 @@ bgp_option_unset (int flag)
/* Fall through. */
case BGP_OPT_NO_FIB:
case BGP_OPT_CONFIG_CISCO:
case BGP_OPT_ALWAYS_OPEN:
UNSET_FLAG (bm->options, flag);
break;
default:
@ -4912,13 +4910,6 @@ bgp_config_write (struct vty *vty)
write++;
}
/* BGP Open-Always */
if (bgp_option_check (BGP_OPT_ALWAYS_OPEN))
{
vty_out (vty, "bgp open-accept%s", VTY_NEWLINE);
write++;
}
/* BGP configuration. */
for (ALL_LIST_ELEMENTS (bm->bgp, mnode, mnnode, bgp))
{

View File

@ -59,7 +59,6 @@ struct bgp_master
#define BGP_OPT_NO_FIB (1 << 0)
#define BGP_OPT_MULTIPLE_INSTANCE (1 << 1)
#define BGP_OPT_CONFIG_CISCO (1 << 2)
#define BGP_OPT_ALWAYS_OPEN (1 << 3)
};
/* BGP instance structure. */