diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-27 22:08:36 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-28 16:55:45 +0200 |
| commit | fcc65b0ff436bf9e10eaaa6c75b60d3288f6850e (patch) | |
| tree | c59ceffc4ceb7153019c3c2a590fe8bedd5cc3ab | |
| parent | bgpd: Fix 'show .. bgp ... neighbors ' command (diff) | |
| download | frr-fcc65b0ff436bf9e10eaaa6c75b60d3288f6850e.tar.xz frr-fcc65b0ff436bf9e10eaaa6c75b60d3288f6850e.zip | |
bgpd: Allow old vpnv4 commands to compile
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 19 | ||||
| -rwxr-xr-x | configure.ac | 4 |
2 files changed, 2 insertions, 21 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index d29fb2603..88cde15e8 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -773,25 +773,6 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd, return CMD_SUCCESS; } -#ifdef KEEP_OLD_VPN_COMMANDS -DEFUN (show_ip_bgp_vpn_all, - show_ip_bgp_vpn_all_cmd, - "show [ip] bgp <vpnv4|vpnv6>", - SHOW_STR - IP_STR - BGP_STR - BGP_VPNVX_HELP_STR) -{ - afi_t afi; - int idx = 0; - - if (argv_find_and_parse_vpnvx (argv, argc, &idx, &afi)) - return bgp_show_mpls_vpn (vty, afi, NULL, bgp_show_type_normal, NULL, 0, 0); - - return CMD_SUCCESS; -} -#endif - DEFUN (show_bgp_ip_vpn_all_rd, show_bgp_ip_vpn_all_rd_cmd, "show bgp "BGP_AFI_CMD_STR" vpn all [rd ASN:nn_or_IP-address:nn] [json]", diff --git a/configure.ac b/configure.ac index 6661f45d7..96052c6f6 100755 --- a/configure.ac +++ b/configure.ac @@ -294,7 +294,7 @@ AC_ARG_ENABLE(rr-semantics, AC_ARG_ENABLE([protobuf], AS_HELP_STRING([--enable-protobuf], [Enable experimental protobuf support])) AC_ARG_ENABLE([oldvpn_commands], - AS_HELP_STRING([--enable-old-vpn-commands], [Keep old vpn commands])) + AS_HELP_STRING([--enable-oldvpn-commands], [Keep old vpn commands])) AC_CHECK_HEADERS(json-c/json.h) AC_CHECK_LIB(json-c, json_object_get, LIBS="$LIBS -ljson-c") @@ -406,7 +406,7 @@ fi # # Logic for old vpn commans support. # -if test "$enable_old_vpn_commands" = "yes"; then +if test "$enable_oldvpn_commands" = "yes"; then AC_DEFINE(KEEP_OLD_VPN_COMMANDS,, [Define for compiling with old vpn commands]) fi |