* bgp_attr.c, bgp_snmp.c, bgp_vty.c, bgpd.[ch]: Remove support for old
draft - ie. "neighbor version 4-" commands. Preserve dummy "neighbor
version" command as deprecated.
[merge from GNU Zebra]
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 02f8e4c..dcca1a3 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -286,6 +286,17 @@
{
return CMD_SUCCESS;
}
+
+DEFUN_DEPRECATED (neighbor_version,
+ neighbor_version_cmd,
+ NEIGHBOR_CMD "version (4|4-)",
+ NEIGHBOR_STR
+ NEIGHBOR_ADDR_STR
+ "Set the BGP version to match a neighbor\n"
+ "Neighbor's BGP version\n")
+{
+ return CMD_SUCCESS;
+}
/* "router bgp" commands. */
DEFUN (router_bgp,
@@ -3091,56 +3102,6 @@
"Minimum interval between sending BGP routing updates\n"
"time in seconds\n")
-int
-peer_version_vty (struct vty *vty, const char *ip_str, const char *str)
-{
- int ret;
- struct peer *peer;
- int version = BGP_VERSION_4;
-
- peer = peer_lookup_vty (vty, ip_str);
- if (! peer)
- return CMD_WARNING;
-
- /* BGP version string check. */
- if (str)
- {
- if (strcmp (str, "4") == 0)
- version = BGP_VERSION_4;
- else if (strcmp (str, "4-") == 0)
- version = BGP_VERSION_MP_4_DRAFT_00;
-
- ret = peer_version_set (peer, version);
- }
- else
- ret = peer_version_unset (peer);
-
- return CMD_SUCCESS;
-}
-
-DEFUN (neighbor_version,
- neighbor_version_cmd,
- NEIGHBOR_CMD "version (4|4-)",
- NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
- "Neighbor's BGP version\n"
- "Border Gateway Protocol 4\n"
- "Multiprotocol Extensions for BGP-4(Old Draft)\n")
-{
- return peer_version_vty (vty, argv[0], argv[1]);
-}
-
-DEFUN (no_neighbor_version,
- no_neighbor_version_cmd,
- NO_NEIGHBOR_CMD "version",
- NO_STR
- NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
- "Neighbor's BGP version\n")
-{
- return peer_version_vty (vty, argv[0], NULL);
-}
-
/* neighbor interface */
int
peer_interface_vty (struct vty *vty, const char *ip_str, const char *str)
@@ -6438,15 +6399,7 @@
else
vty_out (vty, "%*s", len, " ");
- switch (peer->version)
- {
- case BGP_VERSION_4:
- vty_out (vty, "4 ");
- break;
- case BGP_VERSION_MP_4_DRAFT_00:
- vty_out (vty, "4-");
- break;
- }
+ vty_out (vty, "4 ");
vty_out (vty, "%5d %7d %7d %8d %4d %4ld ",
peer->as,
@@ -6982,8 +6935,6 @@
/* BGP Version. */
vty_out (vty, " BGP version 4");
- if (p->version == BGP_VERSION_MP_4_DRAFT_00)
- vty_out (vty, "(with draft-00 verion of multiporotocol extension)");
vty_out (vty, ", remote router ID %s%s",
inet_ntop (AF_INET, &p->remote_id, buf1, BUFSIZ),
VTY_NEWLINE);
@@ -7615,15 +7566,7 @@
else
vty_out (vty, "%*s", len, " ");
- switch (rsclient->version)
- {
- case BGP_VERSION_4:
- vty_out (vty, "4 ");
- break;
- case BGP_VERSION_MP_4_DRAFT_00:
- vty_out (vty, "4-");
- break;
- }
+ vty_out (vty, "4 ");
vty_out (vty, "%5d ", rsclient->as);
@@ -8933,7 +8876,6 @@
/* "neighbor version" commands. */
install_element (BGP_NODE, &neighbor_version_cmd);
- install_element (BGP_NODE, &no_neighbor_version_cmd);
/* "neighbor interface" commands. */
install_element (BGP_NODE, &neighbor_interface_cmd);