summaryrefslogtreecommitdiff
path: root/bgpd
diff options
context:
space:
mode:
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_fsm.c3
-rw-r--r--bgpd/bgp_snmp.c4
-rw-r--r--bgpd/bgp_vty.c26
-rw-r--r--bgpd/bgpd.c9
-rw-r--r--bgpd/bgpd.h1
5 files changed, 4 insertions, 39 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;
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index 3d26890e..576e3e09 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -23,10 +23,12 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h>
-#endif
+#include <net-snmp/net-snmp-includes.h>
+#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
+#endif
#include "if.h"
#include "log.h"
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 90867373..54f11701 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -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);
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index bda35ae5..8eb0d2e4 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -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))
{
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 89dde8f1..afe06635 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -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. */