diff options
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 610 |
1 files changed, 305 insertions, 305 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 67ea246c1e..2472511fe7 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -20,7 +20,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include <zebra.h> -#include "lib/json.h" #include "prefix.h" #include "linklist.h" #include "memory.h" @@ -37,6 +36,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "workqueue.h" #include "queue.h" #include "memory.h" +#include "lib/json.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_table.h" @@ -4265,7 +4265,7 @@ DEFUN (bgp_table_map, "Name of the route map\n") { return bgp_table_map_set (vty, vty->index, - bgp_node_afi (vty), bgp_node_safi (vty), argv[0]); + bgp_node_afi (vty), bgp_node_safi (vty), argv[1]->arg); } DEFUN (no_bgp_table_map, no_bgp_table_map_cmd, @@ -4274,7 +4274,7 @@ DEFUN (no_bgp_table_map, "Name of the route map\n") { return bgp_table_map_unset (vty, vty->index, - bgp_node_afi (vty), bgp_node_safi (vty), argv[0]); + bgp_node_afi (vty), bgp_node_safi (vty), argv[2]->arg); } DEFUN (bgp_network, @@ -4283,7 +4283,7 @@ DEFUN (bgp_network, "Specify a network to announce via BGP\n" "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n") { - return bgp_static_set (vty, vty->index, argv[0], + return bgp_static_set (vty, vty->index, argv[1]->arg, AFI_IP, bgp_node_safi (vty), NULL, 0); } @@ -4295,8 +4295,8 @@ DEFUN (bgp_network_route_map, "Route-map to modify the attributes\n" "Name of the route map\n") { - return bgp_static_set (vty, vty->index, argv[0], - AFI_IP, bgp_node_safi (vty), argv[1], 0); + return bgp_static_set (vty, vty->index, argv[1]->arg, + AFI_IP, bgp_node_safi (vty), argv[3]->arg, 0); } DEFUN (bgp_network_backdoor, @@ -4306,7 +4306,7 @@ DEFUN (bgp_network_backdoor, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "Specify a BGP backdoor route\n") { - return bgp_static_set (vty, vty->index, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_static_set (vty, vty->index, argv[1]->arg, AFI_IP, SAFI_UNICAST, NULL, 1); } @@ -4321,7 +4321,7 @@ DEFUN (bgp_network_mask, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[3]->arg, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4345,7 +4345,7 @@ DEFUN (bgp_network_mask_route_map, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[3]->arg, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4353,7 +4353,7 @@ DEFUN (bgp_network_mask_route_map, } return bgp_static_set (vty, vty->index, prefix_str, - AFI_IP, bgp_node_safi (vty), argv[2], 0); + AFI_IP, bgp_node_safi (vty), argv[5]->arg, 0); } DEFUN (bgp_network_mask_backdoor, @@ -4368,7 +4368,7 @@ DEFUN (bgp_network_mask_backdoor, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[3]->arg, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4388,7 +4388,7 @@ DEFUN (bgp_network_mask_natural, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], NULL, prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, NULL, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4410,7 +4410,7 @@ DEFUN (bgp_network_mask_natural_route_map, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], NULL, prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, NULL, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4418,7 +4418,7 @@ DEFUN (bgp_network_mask_natural_route_map, } return bgp_static_set (vty, vty->index, prefix_str, - AFI_IP, bgp_node_safi (vty), argv[1], 0); + AFI_IP, bgp_node_safi (vty), argv[3]->arg, 0); } DEFUN (bgp_network_mask_natural_backdoor, @@ -4431,7 +4431,7 @@ DEFUN (bgp_network_mask_natural_backdoor, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], NULL, prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, NULL, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4449,7 +4449,7 @@ DEFUN (no_bgp_network, "Specify a network to announce via BGP\n" "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n") { - return bgp_static_unset (vty, vty->index, argv[0], AFI_IP, + return bgp_static_unset (vty, vty->index, argv[2]->arg, AFI_IP, bgp_node_safi (vty)); } @@ -4482,7 +4482,7 @@ DEFUN (no_bgp_network_mask, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[2]->arg, argv[4]->arg, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4524,7 +4524,7 @@ DEFUN (no_bgp_network_mask_natural, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], NULL, prefix_str); + ret = netmask_str2prefix_str (argv[2]->arg, NULL, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); @@ -4559,7 +4559,7 @@ DEFUN (ipv6_bgp_network, "Specify a network to announce via BGP\n" "IPv6 prefix <network>/<length>\n") { - return bgp_static_set (vty, vty->index, argv[0], AFI_IP6, bgp_node_safi(vty), + return bgp_static_set (vty, vty->index, argv[1]->arg, AFI_IP6, bgp_node_safi(vty), NULL, 0); } @@ -4571,8 +4571,8 @@ DEFUN (ipv6_bgp_network_route_map, "Route-map to modify the attributes\n" "Name of the route map\n") { - return bgp_static_set (vty, vty->index, argv[0], AFI_IP6, - bgp_node_safi (vty), argv[1], 0); + return bgp_static_set (vty, vty->index, argv[1]->arg, AFI_IP6, + bgp_node_safi (vty), argv[3]->arg, 0); } DEFUN (no_ipv6_bgp_network, @@ -4582,7 +4582,7 @@ DEFUN (no_ipv6_bgp_network, "Specify a network to announce via BGP\n" "IPv6 prefix <network>/<length>\n") { - return bgp_static_unset (vty, vty->index, argv[0], AFI_IP6, bgp_node_safi(vty)); + return bgp_static_unset (vty, vty->index, argv[2]->arg, AFI_IP6, bgp_node_safi(vty)); } ALIAS (no_ipv6_bgp_network, @@ -5219,7 +5219,7 @@ DEFUN (aggregate_address, "Configure BGP aggregate entries\n" "Aggregate prefix\n") { - return bgp_aggregate_set (vty, argv[0], AFI_IP, bgp_node_safi (vty), 0, 0); + return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP, bgp_node_safi (vty), 0, 0); } DEFUN (aggregate_address_mask, @@ -5232,7 +5232,7 @@ DEFUN (aggregate_address_mask, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[2]->arg, prefix_str); if (! ret) { @@ -5251,7 +5251,7 @@ DEFUN (aggregate_address_summary_only, "Aggregate prefix\n" "Filter more specific routes from updates\n") { - return bgp_aggregate_set (vty, argv[0], AFI_IP, bgp_node_safi (vty), + return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP, bgp_node_safi (vty), AGGREGATE_SUMMARY_ONLY, 0); } @@ -5266,7 +5266,7 @@ DEFUN (aggregate_address_mask_summary_only, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[2]->arg, prefix_str); if (! ret) { @@ -5285,7 +5285,7 @@ DEFUN (aggregate_address_as_set, "Aggregate prefix\n" "Generate AS set path information\n") { - return bgp_aggregate_set (vty, argv[0], AFI_IP, bgp_node_safi (vty), + return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP, bgp_node_safi (vty), 0, AGGREGATE_AS_SET); } @@ -5300,7 +5300,7 @@ DEFUN (aggregate_address_mask_as_set, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[2]->arg, prefix_str); if (! ret) { @@ -5321,7 +5321,7 @@ DEFUN (aggregate_address_as_set_summary, "Generate AS set path information\n" "Filter more specific routes from updates\n") { - return bgp_aggregate_set (vty, argv[0], AFI_IP, bgp_node_safi (vty), + return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP, bgp_node_safi (vty), AGGREGATE_SUMMARY_ONLY, AGGREGATE_AS_SET); } @@ -5345,7 +5345,7 @@ DEFUN (aggregate_address_mask_as_set_summary, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[1]->arg, argv[2]->arg, prefix_str); if (! ret) { @@ -5373,7 +5373,7 @@ DEFUN (no_aggregate_address, "Configure BGP aggregate entries\n" "Aggregate prefix\n") { - return bgp_aggregate_unset (vty, argv[0], AFI_IP, bgp_node_safi (vty)); + return bgp_aggregate_unset (vty, argv[2]->arg, AFI_IP, bgp_node_safi (vty)); } ALIAS (no_aggregate_address, @@ -5421,7 +5421,7 @@ DEFUN (no_aggregate_address_mask, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[2]->arg, argv[3]->arg, prefix_str); if (! ret) { @@ -5477,7 +5477,7 @@ DEFUN (ipv6_aggregate_address, "Configure BGP aggregate entries\n" "Aggregate prefix\n") { - return bgp_aggregate_set (vty, argv[0], AFI_IP6, SAFI_UNICAST, 0, 0); + return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP6, SAFI_UNICAST, 0, 0); } DEFUN (ipv6_aggregate_address_summary_only, @@ -5487,7 +5487,7 @@ DEFUN (ipv6_aggregate_address_summary_only, "Aggregate prefix\n" "Filter more specific routes from updates\n") { - return bgp_aggregate_set (vty, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP6, SAFI_UNICAST, AGGREGATE_SUMMARY_ONLY, 0); } @@ -5498,7 +5498,7 @@ DEFUN (no_ipv6_aggregate_address, "Configure BGP aggregate entries\n" "Aggregate prefix\n") { - return bgp_aggregate_unset (vty, argv[0], AFI_IP6, SAFI_UNICAST); + return bgp_aggregate_unset (vty, argv[2]->arg, AFI_IP6, SAFI_UNICAST); } DEFUN (no_ipv6_aggregate_address_summary_only, @@ -5509,7 +5509,7 @@ DEFUN (no_ipv6_aggregate_address_summary_only, "Aggregate prefix\n" "Filter more specific routes from updates\n") { - return bgp_aggregate_unset (vty, argv[0], AFI_IP6, SAFI_UNICAST); + return bgp_aggregate_unset (vty, argv[2]->arg, AFI_IP6, SAFI_UNICAST); } ALIAS (ipv6_aggregate_address, @@ -7947,7 +7947,7 @@ DEFUN (show_ip_bgp_ipv4, { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show (vty, NULL, AFI_IP, SAFI_MULTICAST, bgp_show_type_normal, NULL, uj); @@ -7973,7 +7973,7 @@ DEFUN (show_ip_bgp_route, "Network in the BGP routing table to display\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_ip_bgp_route_pathtype, @@ -7989,10 +7989,10 @@ DEFUN (show_ip_bgp_route_pathtype, { u_char uj = use_json(argc, argv); - if (strncmp (argv[1], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[4]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); } DEFUN (show_bgp_ipv4_safi_route_pathtype, @@ -8010,16 +8010,16 @@ DEFUN (show_bgp_ipv4_safi_route_pathtype, { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[3]->arg, "m", 1) == 0) + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_MULTICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_MULTICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); else - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); } DEFUN (show_bgp_ipv4_prefix, @@ -8031,7 +8031,7 @@ DEFUN (show_bgp_ipv4_prefix, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" JSON_STR) { - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json (argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json (argc, argv)); } DEFUN (show_bgp_ipv6_route, @@ -8043,7 +8043,7 @@ DEFUN (show_bgp_ipv6_route, "Network in the BGP routing table to display\n" JSON_STR) { - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json (argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json (argc, argv)); } DEFUN (show_bgp_ipv6_prefix, @@ -8055,7 +8055,7 @@ DEFUN (show_bgp_ipv6_prefix, "IPv6 prefix <network>/<length>\n" JSON_STR) { - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json (argc,argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json (argc,argv)); } DEFUN (show_ip_bgp_ipv4_route, @@ -8072,10 +8072,10 @@ DEFUN (show_ip_bgp_ipv4_route, { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, NULL, 0, BGP_PATH_ALL, uj); + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MULTICAST, NULL, 0, BGP_PATH_ALL, uj); - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, uj); + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, uj); } ALIAS (show_ip_bgp_ipv4_route, @@ -8100,7 +8100,7 @@ DEFUN (show_ip_bgp_vpnv4_all_route, "Network in the BGP routing table to display\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_bgp_ipv4_vpn_route, @@ -8113,7 +8113,7 @@ DEFUN (show_bgp_ipv4_vpn_route, "Network in the BGP routing table to display\n" JSON_STR) { - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json (argc, argv)); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json (argc, argv)); } DEFUN (show_bgp_ipv6_vpn_route, @@ -8126,7 +8126,7 @@ DEFUN (show_bgp_ipv6_vpn_route, "Network in the BGP routing table to display\n" JSON_STR) { - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json (argc, argv)); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json (argc, argv)); } DEFUN (show_bgp_ipv4_vpn_rd_route, @@ -8144,13 +8144,13 @@ DEFUN (show_bgp_ipv4_vpn_rd_route, int ret; struct prefix_rd prd; - ret = str2prefix_rd (argv[0], &prd); + ret = str2prefix_rd (argv[5]->arg, &prd); if (! ret) { vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE); return CMD_WARNING; } - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json (argc, argv)); + return bgp_show_route (vty, NULL, argv[6]->arg, AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json (argc, argv)); } DEFUN (show_bgp_ipv6_vpn_rd_route, @@ -8168,13 +8168,13 @@ DEFUN (show_bgp_ipv6_vpn_rd_route, int ret; struct prefix_rd prd; - ret = str2prefix_rd (argv[0], &prd); + ret = str2prefix_rd (argv[5]->arg, &prd); if (! ret) { vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE); return CMD_WARNING; } - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json (argc, argv)); + return bgp_show_route (vty, NULL, argv[6]->arg, AFI_IP6, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json (argc, argv)); } DEFUN (show_ip_bgp_vpnv4_rd_route, @@ -8193,13 +8193,13 @@ DEFUN (show_ip_bgp_vpnv4_rd_route, struct prefix_rd prd; u_char uj= use_json(argc, argv); - ret = str2prefix_rd (argv[0], &prd); + ret = str2prefix_rd (argv[5]->arg, &prd); if (! ret) { vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE); return CMD_WARNING; } - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, uj); + return bgp_show_route (vty, NULL, argv[6]->arg, AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, uj); } DEFUN (show_ip_bgp_prefix, @@ -8211,7 +8211,7 @@ DEFUN (show_ip_bgp_prefix, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_ip_bgp_prefix_pathtype, @@ -8226,10 +8226,10 @@ DEFUN (show_ip_bgp_prefix_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[1], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[4]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); } DEFUN (show_ip_bgp_ipv4_prefix, @@ -8246,10 +8246,10 @@ DEFUN (show_ip_bgp_ipv4_prefix, { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, NULL, 1, BGP_PATH_ALL, uj); + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MULTICAST, NULL, 1, BGP_PATH_ALL, uj); - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, uj); + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, uj); } ALIAS (show_ip_bgp_ipv4_prefix, @@ -8279,16 +8279,16 @@ DEFUN (show_ip_bgp_ipv4_prefix_pathtype, { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[4]->arg, "m", 1) == 0) + if (strncmp (argv[6]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MULTICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MULTICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); else - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[6]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); } ALIAS (show_ip_bgp_ipv4_prefix_pathtype, @@ -8315,7 +8315,7 @@ DEFUN (show_ip_bgp_vpnv4_all_prefix, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_MPLS_VPN, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MPLS_VPN, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_ip_bgp_vpnv4_rd_prefix, @@ -8333,13 +8333,13 @@ DEFUN (show_ip_bgp_vpnv4_rd_prefix, int ret; struct prefix_rd prd; - ret = str2prefix_rd (argv[0], &prd); + ret = str2prefix_rd (argv[5]->arg, &prd); if (! ret) { vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE); return CMD_WARNING; } - return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[6]->arg, AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_ip_bgp_view, @@ -8354,10 +8354,10 @@ DEFUN (show_ip_bgp_view, struct bgp *bgp; /* BGP structure lookup. */ - bgp = bgp_lookup_by_name (argv[1]); + bgp = bgp_lookup_by_name (argv[4]->arg); if (bgp == NULL) { - vty_out (vty, "Can't find BGP instance %s%s", argv[1], VTY_NEWLINE); + vty_out (vty, "Can't find BGP instance %s%s", argv[4]->arg, VTY_NEWLINE); return CMD_WARNING; } @@ -8389,7 +8389,7 @@ DEFUN (show_ip_bgp_instance_route, "Network in the BGP routing table to display\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_ip_bgp_instance_route_pathtype, @@ -8406,10 +8406,10 @@ DEFUN (show_ip_bgp_instance_route_pathtype, { u_char uj = use_json(argc, argv); - if (strncmp (argv[3], "b", 1) == 0) - return bgp_show_route (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[6]->arg, "b", 1) == 0) + return bgp_show_route (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); } DEFUN (show_ip_bgp_instance_prefix, @@ -8422,7 +8422,7 @@ DEFUN (show_ip_bgp_instance_prefix, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_ip_bgp_instance_prefix_pathtype, @@ -8438,10 +8438,10 @@ DEFUN (show_ip_bgp_instance_prefix_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[3], "b", 1) == 0) - return bgp_show_route (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[6]->arg, "b", 1) == 0) + return bgp_show_route (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); } #ifdef HAVE_IPV6 @@ -8475,7 +8475,7 @@ DEFUN (show_bgp_ipv6_safi, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[3]->arg, "m", 1) == 0) return bgp_show (vty, NULL, AFI_IP6, SAFI_MULTICAST, bgp_show_type_normal, NULL, uj); @@ -8512,7 +8512,7 @@ DEFUN (show_bgp_route, "Network in the BGP routing table to display\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_bgp_ipv6_safi_route, @@ -8527,10 +8527,10 @@ DEFUN (show_bgp_ipv6_safi_route, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_ALL, uj); + if (strncmp (argv[3]->arg, "m", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_ALL, uj); - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, uj); } DEFUN (show_bgp_route_pathtype, @@ -8544,10 +8544,10 @@ DEFUN (show_bgp_route_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[1], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[3]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); } ALIAS (show_bgp_route_pathtype, @@ -8575,16 +8575,16 @@ DEFUN (show_bgp_ipv6_safi_route_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[3]->arg, "m", 1) == 0) + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); else - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); } /* old command */ @@ -8598,7 +8598,7 @@ DEFUN (show_ipv6_bgp_route, "JavaScript Object Notation\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_bgp_prefix, @@ -8609,7 +8609,7 @@ DEFUN (show_bgp_prefix, "IPv6 prefix <network>/<length>\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_bgp_ipv6_safi_prefix, @@ -8624,10 +8624,10 @@ DEFUN (show_bgp_ipv6_safi_prefix, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_ALL, uj); + if (strncmp (argv[3]->arg, "m", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_ALL, uj); - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, uj); } DEFUN (show_bgp_prefix_pathtype, @@ -8641,10 +8641,10 @@ DEFUN (show_bgp_prefix_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[1], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[3]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); } ALIAS (show_bgp_prefix_pathtype, @@ -8672,16 +8672,16 @@ DEFUN (show_bgp_ipv6_safi_prefix_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[0], "m", 1) == 0) - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[3]->arg, "m", 1) == 0) + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); else - if (strncmp (argv[2], "b", 1) == 0) - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); } /* old command */ @@ -8695,7 +8695,7 @@ DEFUN (show_ipv6_bgp_prefix, "JavaScript Object Notation\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } DEFUN (show_bgp_view, @@ -8709,10 +8709,10 @@ DEFUN (show_bgp_view, struct bgp *bgp; /* BGP structure lookup. */ - bgp = bgp_lookup_by_name (argv[1]); + bgp = bgp_lookup_by_name (argv[3]->arg); if (bgp == NULL) { - vty_out (vty, "Can't find BGP instance %s%s", argv[1], VTY_NEWLINE); + vty_out (vty, "Can't find BGP instance %s%s", argv[3]->arg, VTY_NEWLINE); return CMD_WARNING; } @@ -8751,7 +8751,7 @@ DEFUN (show_bgp_instance_route, "Network in the BGP routing table to display\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } ALIAS (show_bgp_instance_route, @@ -8776,10 +8776,10 @@ DEFUN (show_bgp_instance_route_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[3], "b", 1) == 0) - return bgp_show_route (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj); } ALIAS (show_bgp_instance_route_pathtype, @@ -8803,7 +8803,7 @@ DEFUN (show_bgp_instance_prefix, "IPv6 prefix <network>/<length>\n" "JavaScript Object Notation\n") { - return bgp_show_route (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } ALIAS (show_bgp_instance_prefix, @@ -8828,10 +8828,10 @@ DEFUN (show_bgp_instance_prefix_pathtype, "JavaScript Object Notation\n") { u_char uj = use_json(argc, argv); - if (strncmp (argv[3], "b", 1) == 0) - return bgp_show_route (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); + if (strncmp (argv[5]->arg, "b", 1) == 0) + return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_BESTPATH, uj); else - return bgp_show_route (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); + return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj); } ALIAS (show_bgp_instance_prefix_pathtype, @@ -8855,7 +8855,7 @@ DEFUN (show_bgp_instance_prefix_list, "Display routes conforming to the prefix-list\n" "IPv6 prefix-list name\n") { - return bgp_show_prefix_list (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, + return bgp_show_prefix_list (vty, argv[3]->arg, argv[5]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_prefix_list); } @@ -8878,7 +8878,7 @@ DEFUN (show_bgp_instance_filter_list, "Display routes conforming to the filter-list\n" "Regular expression access list name\n") { - return bgp_show_filter_list (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, + return bgp_show_filter_list (vty, argv[3]->arg, argv[5]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_filter_list); } @@ -8901,7 +8901,7 @@ DEFUN (show_bgp_instance_route_map, "Display routes matching the route-map\n" "A route-map to match on\n") { - return bgp_show_route_map (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, + return bgp_show_route_map (vty, argv[3]->arg, argv[5]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_route_map); } @@ -8925,7 +8925,7 @@ DEFUN (show_bgp_instance_community_list, "community-list number\n" "community-list name\n") { - return bgp_show_community_list (vty, argv[1], argv[2], 0, AFI_IP6, SAFI_UNICAST); + return bgp_show_community_list (vty, argv[3]->arg, argv[5]->arg, 0, AFI_IP6, SAFI_UNICAST); } ALIAS (show_bgp_instance_community_list, @@ -8948,7 +8948,7 @@ DEFUN (show_bgp_instance_prefix_longer, "IPv6 prefix <network>/<length>\n" "Display route and more specific routes\n") { - return bgp_show_prefix_longer (vty, argv[1], argv[2], AFI_IP6, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_prefix_longer); } @@ -8987,7 +8987,7 @@ DEFUN (show_ipv6_mbgp_route, "JavaScript Object Notation\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv)); } /* old command */ @@ -9001,13 +9001,13 @@ DEFUN (show_ipv6_mbgp_prefix, "JavaScript Object Notation\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); + return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_MULTICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv)); } #endif static int -bgp_show_regexp (struct vty *vty, int argc, const char **argv, afi_t afi, +bgp_show_regexp (struct vty *vty, int argc, struct cmd_token **argv, afi_t afi, safi_t safi, enum bgp_show_type type) { int i; @@ -9025,12 +9025,12 @@ bgp_show_regexp (struct vty *vty, int argc, const char **argv, afi_t afi, buffer_putc (b, ' '); else { - if ((strcmp (argv[i], "unicast") == 0) || (strcmp (argv[i], "multicast") == 0)) + if ((strcmp (argv[i]->arg, "unicast") == 0) || (strcmp (argv[i]->arg, "multicast") == 0)) continue; first = 1; } - buffer_putstr (b, argv[i]); + buffer_putstr (b, argv[i]->arg); } buffer_putc (b, '\0'); @@ -9041,7 +9041,7 @@ bgp_show_regexp (struct vty *vty, int argc, const char **argv, afi_t afi, XFREE(MTYPE_TMP, regstr); if (! regex) { - vty_out (vty, "Can't compile regexp %s%s", argv[0], + vty_out (vty, "Can't compile regexp %s%s", argv[0]->arg, VTY_NEWLINE); return CMD_WARNING; } @@ -9101,7 +9101,7 @@ DEFUN (show_ip_bgp_ipv4_regexp, "Display routes matching the AS path regular expression\n" "A regular-expression to match the BGP AS paths\n") { - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show_regexp (vty, argc, argv, AFI_IP, SAFI_MULTICAST, bgp_show_type_regexp); @@ -9196,7 +9196,7 @@ DEFUN (show_ip_bgp_prefix_list, "Display routes conforming to the prefix-list\n" "IP prefix-list name\n") { - return bgp_show_prefix_list (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_list (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_prefix_list); } @@ -9210,7 +9210,7 @@ DEFUN (show_ip_bgp_instance_prefix_list, "Display routes conforming to the prefix-list\n" "IP prefix-list name\n") { - return bgp_show_prefix_list (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_list (vty, argv[4]->arg, argv[6]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_prefix_list); } @@ -9224,7 +9224,7 @@ DEFUN (show_ip_bgp_flap_prefix_list, "Display routes conforming to the prefix-list\n" "IP prefix-list name\n") { - return bgp_show_prefix_list (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_list (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_flap_prefix_list); } @@ -9251,11 +9251,11 @@ DEFUN (show_ip_bgp_ipv4_prefix_list, "Display routes conforming to the prefix-list\n" "IP prefix-list name\n") { - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_prefix_list (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_prefix_list (vty, NULL, argv[6]->arg, AFI_IP, SAFI_MULTICAST, bgp_show_type_prefix_list); - return bgp_show_prefix_list (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_list (vty, NULL, argv[6]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_prefix_list); } @@ -9268,7 +9268,7 @@ DEFUN (show_bgp_prefix_list, "Display routes conforming to the prefix-list\n" "IPv6 prefix-list name\n") { - return bgp_show_prefix_list (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_prefix_list (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_prefix_list); } @@ -9292,7 +9292,7 @@ DEFUN (show_ipv6_bgp_prefix_list, "IPv6 prefix-list name\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_prefix_list (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_prefix_list (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_prefix_list); } @@ -9307,7 +9307,7 @@ DEFUN (show_ipv6_mbgp_prefix_list, "IPv6 prefix-list name\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_prefix_list (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, + return bgp_show_prefix_list (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, bgp_show_type_prefix_list); } #endif /* HAVE_IPV6 */ @@ -9345,7 +9345,7 @@ DEFUN (show_ip_bgp_filter_list, "Display routes conforming to the filter-list\n" "Regular expression access list name\n") { - return bgp_show_filter_list (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_filter_list (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_filter_list); } @@ -9359,7 +9359,7 @@ DEFUN (show_ip_bgp_instance_filter_list, "Display routes conforming to the filter-list\n" "Regular expression access list name\n") { - return bgp_show_filter_list (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, + return bgp_show_filter_list (vty, argv[4]->arg, argv[6]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_filter_list); } @@ -9373,7 +9373,7 @@ DEFUN (show_ip_bgp_flap_filter_list, "Display routes conforming to the filter-list\n" "Regular expression access list name\n") { - return bgp_show_filter_list (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_filter_list (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_flap_filter_list); } @@ -9400,11 +9400,11 @@ DEFUN (show_ip_bgp_ipv4_filter_list, "Display routes conforming to the filter-list\n" "Regular expression access list name\n") { - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_filter_list (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_filter_list (vty, NULL, argv[6]->arg, AFI_IP, SAFI_MULTICAST, bgp_show_type_filter_list); - return bgp_show_filter_list (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, + return bgp_show_filter_list (vty, NULL, argv[6]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_filter_list); } @@ -9417,7 +9417,7 @@ DEFUN (show_bgp_filter_list, "Display routes conforming to the filter-list\n" "Regular expression access list name\n") { - return bgp_show_filter_list (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_filter_list (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_filter_list); } @@ -9441,7 +9441,7 @@ DEFUN (show_ipv6_bgp_filter_list, "Regular expression access list name\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_filter_list (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_filter_list (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_filter_list); } @@ -9456,7 +9456,7 @@ DEFUN (show_ipv6_mbgp_filter_list, "Regular expression access list name\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_filter_list (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, + return bgp_show_filter_list (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_MULTICAST, bgp_show_type_filter_list); } #endif /* HAVE_IPV6 */ @@ -9486,7 +9486,7 @@ DEFUN (show_ip_bgp_ipv4_dampening_parameters, "Display detailed information about dampening\n" "Display detail of configured dampening parameters\n") { - if (strncmp(argv[0], "m", 1) == 0) + if (strncmp(argv[4]->arg, "m", 1) == 0) return bgp_show_dampening_parameters (vty, AFI_IP, SAFI_MULTICAST); return bgp_show_dampening_parameters (vty, AFI_IP, SAFI_UNICAST); @@ -9505,7 +9505,7 @@ DEFUN (show_ip_bgp_ipv4_dampening_flap_stats, "Display detailed information about dampening\n" "Display flap statistics of routes\n") { - if (strncmp(argv[0], "m", 1) == 0) + if (strncmp(argv[4]->arg, "m", 1) == 0) return bgp_show (vty, NULL, AFI_IP, SAFI_MULTICAST, bgp_show_type_flap_statistics, NULL, 0); @@ -9525,7 +9525,7 @@ DEFUN (show_ip_bgp_ipv4_dampening_dampd_paths, "Display detailed information about dampening\n" "Display paths suppressed due to dampening\n") { - if (strncmp(argv[0], "m", 1) == 0) + if (strncmp(argv[4]->arg, "m", 1) == 0) return bgp_show (vty, NULL, AFI_IP, SAFI_MULTICAST, bgp_show_type_dampend_paths, NULL, 0); @@ -9567,7 +9567,7 @@ DEFUN (show_ip_bgp_route_map, "Display routes matching the route-map\n" "A route-map to match on\n") { - return bgp_show_route_map (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_route_map (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_route_map); } @@ -9581,7 +9581,7 @@ DEFUN (show_ip_bgp_instance_route_map, "Display routes matching the route-map\n" "A route-map to match on\n") { - return bgp_show_route_map (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, + return bgp_show_route_map (vty, argv[4]->arg, argv[6]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_route_map); } @@ -9595,7 +9595,7 @@ DEFUN (show_ip_bgp_flap_route_map, "Display routes matching the route-map\n" "A route-map to match on\n") { - return bgp_show_route_map (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_route_map (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_flap_route_map); } @@ -9622,11 +9622,11 @@ DEFUN (show_ip_bgp_ipv4_route_map, "Display routes matching the route-map\n" "A route-map to match on\n") { - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_route_map (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_route_map (vty, NULL, argv[6]->arg, AFI_IP, SAFI_MULTICAST, bgp_show_type_route_map); - return bgp_show_route_map (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, + return bgp_show_route_map (vty, NULL, argv[6]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_route_map); } @@ -9638,7 +9638,7 @@ DEFUN (show_bgp_route_map, "Display routes matching the route-map\n" "A route-map to match on\n") { - return bgp_show_route_map (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_route_map (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_route_map); } @@ -9697,7 +9697,7 @@ DEFUN (show_ip_bgp_ipv4_cidr_only, "Address Family modifier\n" "Display only routes with non-natural netmasks\n") { - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show (vty, NULL, AFI_IP, SAFI_MULTICAST, bgp_show_type_cidr_only, NULL, 0); @@ -9728,7 +9728,7 @@ DEFUN (show_ip_bgp_ipv4_community_all, "Address Family modifier\n" "Display routes matching the communities\n") { - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show (vty, NULL, AFI_IP, SAFI_MULTICAST, bgp_show_type_community_all, NULL, 0); @@ -9787,7 +9787,7 @@ DEFUN (show_ipv6_mbgp_community_all, static int bgp_show_community (struct vty *vty, const char *view_name, int argc, - const char **argv, int exact, afi_t afi, safi_t safi) + struct cmd_token **argv, int exact, afi_t afi, safi_t safi) { struct community *com; struct buffer *b; @@ -9823,12 +9823,12 @@ bgp_show_community (struct vty *vty, const char *view_name, int argc, buffer_putc (b, ' '); else { - if ((strcmp (argv[i], "unicast") == 0) || (strcmp (argv[i], "multicast") == 0)) + if ((strcmp (argv[i]->arg, "unicast") == 0) || (strcmp (argv[i]->arg, "multicast") == 0)) continue; first = 1; } - buffer_putstr (b, argv[i]); + buffer_putstr (b, argv[i]->arg); } buffer_putc (b, '\0'); @@ -9938,7 +9938,7 @@ DEFUN (show_ip_bgp_ipv4_community, "Do not advertise to any peer (well-known community)\n" "Do not export to next AS (well-known community)\n") { - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show_community (vty, NULL, argc, argv, 0, AFI_IP, SAFI_MULTICAST); return bgp_show_community (vty, NULL, argc, argv, 0, AFI_IP, SAFI_UNICAST); @@ -10030,15 +10030,15 @@ DEFUN (show_bgp_instance_afi_safi_community_all, struct bgp *bgp; /* BGP structure lookup. */ - bgp = bgp_lookup_by_name (argv[1]); + bgp = bgp_lookup_by_name (argv[3]->arg); if (bgp == NULL) { - vty_out (vty, "Can't find BGP instance %s%s", argv[1], VTY_NEWLINE); + vty_out (vty, "Can't find BGP instance %s%s", argv[3]->arg, VTY_NEWLINE); return CMD_WARNING; } - afi = (strncmp (argv[2], "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP; - safi = (strncmp (argv[3], "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST; + afi = (strncmp (argv[4]->arg, "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP; + safi = (strncmp (argv[5]->arg, "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST; return bgp_show (vty, bgp, afi, safi, bgp_show_type_community_all, NULL, 0); } @@ -10061,9 +10061,9 @@ DEFUN (show_bgp_instance_afi_safi_community, int afi; int safi; - afi = (strncmp (argv[2], "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP; - safi = (strncmp (argv[3], "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST; - return bgp_show_community (vty, argv[1], argc-4, &argv[4], 0, afi, safi); + afi = (strncmp (argv[4]->arg, "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP; + safi = (strncmp (argv[5]->arg, "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST; + return bgp_show_community (vty, argv[3]->arg, argc, argv, 0, afi, safi); } ALIAS (show_bgp_instance_afi_safi_community, @@ -10233,7 +10233,7 @@ DEFUN (show_ip_bgp_ipv4_community_exact, "Do not export to next AS (well-known community)\n" "Exact match of the communities") { - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP, SAFI_MULTICAST); return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP, SAFI_UNICAST); @@ -10972,7 +10972,7 @@ DEFUN (show_ip_bgp_community_list, "community-list number\n" "community-list name\n") { - return bgp_show_community_list (vty, NULL, argv[0], 0, AFI_IP, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[4]->arg, 0, AFI_IP, SAFI_UNICAST); } DEFUN (show_ip_bgp_instance_community_list, @@ -10986,7 +10986,7 @@ DEFUN (show_ip_bgp_instance_community_list, "community-list number\n" "community-list name\n") { - return bgp_show_community_list (vty, argv[1], argv[2], 0, AFI_IP, SAFI_UNICAST); + return bgp_show_community_list (vty, argv[4]->arg, argv[6]->arg, 0, AFI_IP, SAFI_UNICAST); } DEFUN (show_ip_bgp_ipv4_community_list, @@ -11002,10 +11002,10 @@ DEFUN (show_ip_bgp_ipv4_community_list, "community-list number\n" "community-list name\n") { - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_community_list (vty, NULL, argv[1], 0, AFI_IP, SAFI_MULTICAST); + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_community_list (vty, NULL, argv[6]->arg, 0, AFI_IP, SAFI_MULTICAST); - return bgp_show_community_list (vty, NULL, argv[1], 0, AFI_IP, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[6]->arg, 0, AFI_IP, SAFI_UNICAST); } DEFUN (show_ip_bgp_community_list_exact, @@ -11019,7 +11019,7 @@ DEFUN (show_ip_bgp_community_list_exact, "community-list name\n" "Exact match of the communities\n") { - return bgp_show_community_list (vty, NULL, argv[0], 1, AFI_IP, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[4]->arg, 1, AFI_IP, SAFI_UNICAST); } DEFUN (show_ip_bgp_ipv4_community_list_exact, @@ -11036,10 +11036,10 @@ DEFUN (show_ip_bgp_ipv4_community_list_exact, "community-list name\n" "Exact match of the communities\n") { - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_community_list (vty, NULL, argv[1], 1, AFI_IP, SAFI_MULTICAST); + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_community_list (vty, NULL, argv[6]->arg, 1, AFI_IP, SAFI_MULTICAST); - return bgp_show_community_list (vty, NULL, argv[1], 1, AFI_IP, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[6]->arg, 1, AFI_IP, SAFI_UNICAST); } #ifdef HAVE_IPV6 @@ -11052,7 +11052,7 @@ DEFUN (show_bgp_community_list, "community-list number\n" "community-list name\n") { - return bgp_show_community_list (vty, NULL, argv[0], 0, AFI_IP6, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[3]->arg, 0, AFI_IP6, SAFI_UNICAST); } ALIAS (show_bgp_community_list, @@ -11076,7 +11076,7 @@ DEFUN (show_ipv6_bgp_community_list, "community-list name\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_community_list (vty, NULL, argv[0], 0, AFI_IP6, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[4]->arg, 0, AFI_IP6, SAFI_UNICAST); } /* old command */ @@ -11090,7 +11090,7 @@ DEFUN (show_ipv6_mbgp_community_list, "community-list name\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_community_list (vty, NULL, argv[0], 0, AFI_IP6, SAFI_MULTICAST); + return bgp_show_community_list (vty, NULL, argv[4]->arg, 0, AFI_IP6, SAFI_MULTICAST); } DEFUN (show_bgp_community_list_exact, @@ -11103,7 +11103,7 @@ DEFUN (show_bgp_community_list_exact, "community-list name\n" "Exact match of the communities\n") { - return bgp_show_community_list (vty, NULL, argv[0], 1, AFI_IP6, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[3]->arg, 1, AFI_IP6, SAFI_UNICAST); } ALIAS (show_bgp_community_list_exact, @@ -11129,7 +11129,7 @@ DEFUN (show_ipv6_bgp_community_list_exact, "Exact match of the communities\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_community_list (vty, NULL, argv[0], 1, AFI_IP6, SAFI_UNICAST); + return bgp_show_community_list (vty, NULL, argv[4]->arg, 1, AFI_IP6, SAFI_UNICAST); } /* old command */ @@ -11144,7 +11144,7 @@ DEFUN (show_ipv6_mbgp_community_list_exact, "Exact match of the communities\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_community_list (vty, NULL, argv[0], 1, AFI_IP6, SAFI_MULTICAST); + return bgp_show_community_list (vty, NULL, argv[4]->arg, 1, AFI_IP6, SAFI_MULTICAST); } #endif /* HAVE_IPV6 */ @@ -11186,7 +11186,7 @@ DEFUN (show_ip_bgp_prefix_longer, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "Display route and more specific routes\n") { - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_prefix_longer); } @@ -11200,7 +11200,7 @@ DEFUN (show_ip_bgp_instance_prefix_longer, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "Display route and more specific routes\n") { - return bgp_show_prefix_longer (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, argv[4]->arg, argv[5]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_prefix_longer); } @@ -11214,7 +11214,7 @@ DEFUN (show_ip_bgp_flap_prefix_longer, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "Display route and more specific routes\n") { - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_flap_prefix_longer); } @@ -11241,11 +11241,11 @@ DEFUN (show_ip_bgp_ipv4_prefix_longer, "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n" "Display route and more specific routes\n") { - if (strncmp (argv[0], "m", 1) == 0) - return bgp_show_prefix_longer (vty, NULL, argv[1], AFI_IP, SAFI_MULTICAST, + if (strncmp (argv[4]->arg, "m", 1) == 0) + return bgp_show_prefix_longer (vty, NULL, argv[5]->arg, AFI_IP, SAFI_MULTICAST, bgp_show_type_prefix_longer); - return bgp_show_prefix_longer (vty, NULL, argv[1], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_prefix_longer); } @@ -11258,7 +11258,7 @@ DEFUN (show_ip_bgp_flap_address, "Display flap statistics of routes\n" "Network in the BGP routing table to display\n") { - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_flap_address); } @@ -11281,7 +11281,7 @@ DEFUN (show_ip_bgp_flap_prefix, "Display flap statistics of routes\n" "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n") { - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, bgp_show_type_flap_prefix); } @@ -11304,7 +11304,7 @@ DEFUN (show_bgp_prefix_longer, "IPv6 prefix <network>/<length>\n" "Display route and more specific routes\n") { - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_prefix_longer); } @@ -11328,7 +11328,7 @@ DEFUN (show_ipv6_bgp_prefix_longer, "Display route and more specific routes\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP6, SAFI_UNICAST, + return bgp_show_prefix_longer (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, bgp_show_type_prefix_longer); } @@ -11343,7 +11343,7 @@ DEFUN (show_ipv6_mbgp_prefix_longer, "Display route and more specific routes\n") { bgp_show_ipv6_bgp_deprecate_warning(vty); - return bgp_show_prefix_longer (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, + return bgp_show_prefix_longer (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_MULTICAST, bgp_show_type_prefix_longer); } #endif /* HAVE_IPV6 */ @@ -11758,7 +11758,7 @@ DEFUN (show_bgp_statistics, "Address Family modifier\n" "BGP RIB advertisement statistics\n") { - return bgp_table_stats_vty (vty, NULL, argv[0], argv[1]); + return bgp_table_stats_vty (vty, NULL, argv[2]->arg, argv[3]->arg); } DEFUN (show_bgp_statistics_view, @@ -11775,7 +11775,7 @@ DEFUN (show_bgp_statistics_view, "Address Family modifier\n" "BGP RIB advertisement statistics\n") { - return bgp_table_stats_vty (vty, NULL, argv[1], argv[2]); + return bgp_table_stats_vty (vty, NULL, argv[3]->arg, argv[4]->arg); } enum bgp_pcounts @@ -11985,7 +11985,7 @@ DEFUN (show_ip_bgp_neighbor_prefix_counts, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -12009,7 +12009,7 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + peer = peer_lookup_in_view (vty, argv[4]->arg, argv[6]->arg, uj); if (! peer) return CMD_WARNING; @@ -12032,7 +12032,7 @@ DEFUN (show_bgp_ipv6_neighbor_prefix_counts, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -12056,7 +12056,7 @@ DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[6]->arg, uj); if (! peer) return CMD_WARNING; @@ -12082,11 +12082,11 @@ DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[6]->arg, uj); if (! peer) return CMD_WARNING; - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_peer_counts (vty, peer, AFI_IP, SAFI_MULTICAST, uj); return bgp_peer_counts (vty, peer, AFI_IP, SAFI_UNICAST, uj); @@ -12111,7 +12111,7 @@ DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[6]->arg, uj); if (! peer) return CMD_WARNING; @@ -12374,10 +12374,10 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route, struct peer *peer; u_char uj = use_json(argc, argv); - if (argc == 4 || (argc == 3 && argv[2] && strcmp(argv[2], "json") != 0)) - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + if (argc == 4 || (argc == 3 && argv[6]->arg && strcmp(argv[6]->arg, "json") != 0)) + peer = peer_lookup_in_view (vty, argv[4]->arg, argv[6]->arg, uj); else - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -12403,14 +12403,14 @@ DEFUN (show_ip_bgp_neighbor_advertised_route, const char *rmap_name = NULL; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; - if ((argc == 2 && argv[1] && strcmp(argv[1], "json") != 0) + if ((argc == 2 && argv[6]->arg && strcmp(argv[6]->arg, "json") != 0) || (argc == 3)) - rmap_name = argv[1]; + rmap_name = argv[6]->arg; return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 0, rmap_name, uj); } @@ -12461,14 +12461,14 @@ DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route, const char *rmap_name = NULL; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[6]->arg, uj); if (! peer) return CMD_WARNING; - if ((argc == 4) || (argc == 3 && argv[2] && strcmp(argv[2], "json") != 0)) - rmap_name = argv[2]; + if ((argc == 4) || (argc == 3 && argv[8]->arg && strcmp(argv[8]->arg, "json") != 0)) + rmap_name = argv[8]->arg; - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return peer_adj_routes (vty, peer, AFI_IP, SAFI_MULTICAST, 0, rmap_name, uj); else return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 0, rmap_name, uj); @@ -12508,10 +12508,10 @@ DEFUN (show_bgp_instance_neighbor_advertised_route, struct peer *peer; u_char uj = use_json(argc, argv); - if (argc == 4 || (argc == 3 && argv[2] && strcmp(argv[2], "json") != 0)) - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + if (argc == 4 || (argc == 3 && argv[5]->arg && strcmp(argv[5]->arg, "json") != 0)) + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[5]->arg, uj); else - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[3]->arg, uj); if (! peer) return CMD_WARNING; @@ -12550,13 +12550,13 @@ DEFUN (show_bgp_neighbor_advertised_route, const char *rmap_name = NULL; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[3]->arg, uj); if (!peer) return CMD_WARNING; - if (argc == 3 || (argc == 2 && argv[1] && strcmp(argv[1], "json") != 0)) - rmap_name = argv[1]; + if (argc == 3 || (argc == 2 && argv[5]->arg && strcmp(argv[5]->arg, "json") != 0)) + rmap_name = argv[5]->arg; return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 0, rmap_name, uj); } @@ -12606,7 +12606,7 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -12631,7 +12631,7 @@ DEFUN (show_bgp_instance_neighbor_received_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[5]->arg, uj); if (! peer) return CMD_WARNING; @@ -12655,7 +12655,7 @@ DEFUN (show_ip_bgp_instance_neighbor_received_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + peer = peer_lookup_in_view (vty, argv[4]->arg, argv[6]->arg, uj); if (! peer) return CMD_WARNING; @@ -12694,13 +12694,13 @@ DEFUN (show_ip_bgp_neighbor_received_routes, const char *rmap_name = NULL; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; - if (argc == 3 || (argc == 2 && argv[1] && strcmp(argv[1], "json") != 0)) - rmap_name = argv[1]; + if (argc == 3 || (argc == 2 && argv[6]->arg && strcmp(argv[6]->arg, "json") != 0)) + rmap_name = argv[6]->arg; return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 1, rmap_name, uj); } @@ -12752,14 +12752,14 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_routes, const char *rmap_name = NULL; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[6]->arg, uj); if (! peer) return CMD_WARNING; - if (argc == 4 || (argc == 3 && argv[2] && strcmp(argv[2], "json") != 0)) - rmap_name = argv[2]; + if (argc == 4 || (argc == 3 && argv[8]->arg && strcmp(argv[8]->arg, "json") != 0)) + rmap_name = argv[8]->arg; - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return peer_adj_routes (vty, peer, AFI_IP, SAFI_MULTICAST, 1, rmap_name, uj); else return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 1, rmap_name, uj); @@ -12805,14 +12805,14 @@ DEFUN (show_bgp_instance_afi_safi_neighbor_adv_recd_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[4], uj); + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[7]->arg, uj); if (! peer) return CMD_WARNING; - afi = (strncmp (argv[2], "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP; - safi = (strncmp (argv[3], "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST; - in = (strncmp (argv[5], "r", 1) == 0) ? 1 : 0; + afi = (strncmp (argv[4]->arg, "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP; + safi = (strncmp (argv[5]->arg, "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST; + in = (strncmp (argv[8]->arg, "r", 1) == 0) ? 1 : 0; return peer_adj_routes (vty, peer, afi, safi, in, NULL, uj); } @@ -12837,10 +12837,10 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter, int count, ret; u_char uj = use_json(argc, argv); - ret = str2sockunion (argv[0], &su); + ret = str2sockunion (argv[4]->arg, &su); if (ret < 0) { - peer = peer_lookup_by_conf_if (NULL, argv[0]); + peer = peer_lookup_by_conf_if (NULL, argv[4]->arg); if (! peer) { if (uj) @@ -12850,13 +12850,13 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter, json_no = json_object_new_object(); json_sub = json_object_new_object(); json_object_string_add(json_no, "warning", "Malformed address or name"); - json_object_string_add(json_sub, "warningCause", argv[0]); + json_object_string_add(json_sub, "warningCause", argv[4]->arg); json_object_object_add(json_no, "detail", json_sub); vty_out (vty, "%s%s", json_object_to_json_string(json_no), VTY_NEWLINE); json_object_free(json_no); } else - vty_out (vty, "%% Malformed address or name: %s%s", argv[0], VTY_NEWLINE); + vty_out (vty, "%% Malformed address or name: %s%s", argv[4]->arg, VTY_NEWLINE); return CMD_WARNING; } } @@ -12927,10 +12927,10 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter, int count, ret; u_char uj = use_json(argc, argv); - ret = str2sockunion (argv[1], &su); + ret = str2sockunion (argv[6]->arg, &su); if (ret < 0) { - peer = peer_lookup_by_conf_if (NULL, argv[1]); + peer = peer_lookup_by_conf_if (NULL, argv[6]->arg); if (! peer) { if (uj) @@ -12940,13 +12940,13 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter, json_no = json_object_new_object(); json_sub = json_object_new_object(); json_object_string_add(json_no, "warning", "Malformed address or name"); - json_object_string_add(json_sub, "warningCause", argv[1]); + json_object_string_add(json_sub, "warningCause", argv[6]->arg); json_object_object_add(json_no, "detail", json_sub); vty_out (vty, "%s%s", json_object_to_json_string(json_no), VTY_NEWLINE); json_object_free(json_no); } else - vty_out (vty, "%% Malformed address or name: %s%s", argv[1], VTY_NEWLINE); + vty_out (vty, "%% Malformed address or name: %s%s", argv[6]->arg, VTY_NEWLINE); return CMD_WARNING; } } @@ -12969,7 +12969,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter, } } - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) { sprintf (name, "%s.%d.%d", peer->host, AFI_IP, SAFI_MULTICAST); count = prefix_bgp_show_prefix_list (NULL, AFI_IP, name, uj); @@ -13037,13 +13037,13 @@ DEFUN (show_bgp_neighbor_received_routes, const char *rmap_name = NULL; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[3]->arg, uj); if (! peer) return CMD_WARNING; - if (argc == 3 || (argc == 2 && argv[1] && strcmp(argv[1], "json") != 0)) - rmap_name = argv[1]; + if (argc == 3 || (argc == 2 && argv[5]->arg && strcmp(argv[5]->arg, "json") != 0)) + rmap_name = argv[5]->arg; return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 1, rmap_name, uj); } @@ -13080,10 +13080,10 @@ DEFUN (show_bgp_neighbor_received_prefix_filter, int count, ret; u_char uj = use_json(argc, argv); - ret = str2sockunion (argv[0], &su); + ret = str2sockunion (argv[3]->arg, &su); if (ret < 0) { - peer = peer_lookup_by_conf_if (NULL, argv[0]); + peer = peer_lookup_by_conf_if (NULL, argv[3]->arg); if (! peer) { if (uj) @@ -13093,13 +13093,13 @@ DEFUN (show_bgp_neighbor_received_prefix_filter, json_no = json_object_new_object(); json_sub = json_object_new_object(); json_object_string_add(json_no, "warning", "Malformed address or name"); - json_object_string_add(json_sub, "warningCause", argv[0]); + json_object_string_add(json_sub, "warningCause", argv[3]->arg); json_object_object_add(json_no, "detail", json_sub); vty_out (vty, "%s%s", json_object_to_json_string(json_no), VTY_NEWLINE); json_object_free(json_no); } else - vty_out (vty, "%% Malformed address or name: %s%s", argv[0], VTY_NEWLINE); + vty_out (vty, "%% Malformed address or name: %s%s", argv[3]->arg, VTY_NEWLINE); return CMD_WARNING; } } @@ -13192,7 +13192,7 @@ DEFUN (ipv6_mbgp_neighbor_received_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -13222,7 +13222,7 @@ DEFUN (show_bgp_instance_neighbor_received_prefix_filter, u_char uj = use_json(argc, argv); /* BGP structure lookup. */ - bgp = bgp_lookup_by_name (argv[1]); + bgp = bgp_lookup_by_name (argv[3]->arg); if (bgp == NULL) { if (uj) @@ -13234,14 +13234,14 @@ DEFUN (show_bgp_instance_neighbor_received_prefix_filter, json_object_free(json_no); } else - vty_out (vty, "Can't find BGP instance %s%s", argv[1], VTY_NEWLINE); + vty_out (vty, "Can't find BGP instance %s%s", argv[3]->arg, VTY_NEWLINE); return CMD_WARNING; } - ret = str2sockunion (argv[2], &su); + ret = str2sockunion (argv[5]->arg, &su); if (ret < 0) { - peer = peer_lookup_by_conf_if (bgp, argv[2]); + peer = peer_lookup_by_conf_if (bgp, argv[5]->arg); if (! peer) { if (uj) @@ -13251,13 +13251,13 @@ DEFUN (show_bgp_instance_neighbor_received_prefix_filter, json_no = json_object_new_object(); json_sub = json_object_new_object(); json_object_string_add(json_no, "warning", "Malformed address or name"); - json_object_string_add(json_sub, "warningCause", argv[2]); + json_object_string_add(json_sub, "warningCause", argv[5]->arg); json_object_object_add(json_no, "detail", json_sub); vty_out (vty, "%s%s", json_object_to_json_string(json_no), VTY_NEWLINE); json_object_free(json_no); } else - vty_out (vty, "%% Malformed address or name: %s%s", argv[2], VTY_NEWLINE); + vty_out (vty, "%% Malformed address or name: %s%s", argv[5]->arg, VTY_NEWLINE); return CMD_WARNING; } } @@ -13346,7 +13346,7 @@ DEFUN (show_ip_bgp_neighbor_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -13371,7 +13371,7 @@ DEFUN (show_ip_bgp_instance_neighbor_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + peer = peer_lookup_in_view (vty, argv[4]->arg, argv[6]->arg, uj); if (! peer) return CMD_WARNING; @@ -13395,7 +13395,7 @@ DEFUN (show_ip_bgp_neighbor_flap, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -13419,7 +13419,7 @@ DEFUN (show_ip_bgp_neighbor_damp, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -13446,11 +13446,11 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[6]->arg, uj); if (! peer) return CMD_WARNING; - if (strncmp (argv[0], "m", 1) == 0) + if (strncmp (argv[4]->arg, "m", 1) == 0) return bgp_show_neighbor_route (vty, peer, AFI_IP, SAFI_MULTICAST, bgp_show_type_neighbor, uj); @@ -13475,7 +13475,7 @@ DEFUN (show_bgp_instance_neighbor_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[5]->arg, uj); if (! peer) return CMD_WARNING; @@ -13513,11 +13513,11 @@ DEFUN (show_bgp_instance_neighbor_damp, struct peer *peer; u_char uj = use_json(argc, argv); - if ((argc == 4 && argv[3] && strcmp(argv[3], "json") == 0) - || (argc == 3 && argv[2] && strcmp(argv[2], "json") != 0)) - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + if ((argc == 4 && argv[7]->arg && strcmp(argv[7]->arg, "json") == 0) + || (argc == 3 && argv[5]->arg && strcmp(argv[5]->arg, "json") != 0)) + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[5]->arg, uj); else - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[3]->arg, uj); if (! peer) return CMD_WARNING; @@ -13556,11 +13556,11 @@ DEFUN (show_bgp_instance_neighbor_flap, struct peer *peer; u_char uj = use_json(argc, argv); - if ((argc == 4 && argv[3] && strcmp(argv[3], "json") == 0) - || (argc == 3 && argv[2] && strcmp(argv[2], "json") != 0)) - peer = peer_lookup_in_view (vty, argv[1], argv[2], uj); + if ((argc == 4 && argv[7]->arg && strcmp(argv[7]->arg, "json") == 0) + || (argc == 3 && argv[5]->arg && strcmp(argv[5]->arg, "json") != 0)) + peer = peer_lookup_in_view (vty, argv[3]->arg, argv[5]->arg, uj); else - peer = peer_lookup_in_view (vty, NULL, argv[1], uj); + peer = peer_lookup_in_view (vty, NULL, argv[3]->arg, uj); if (! peer) return CMD_WARNING; @@ -13598,7 +13598,7 @@ DEFUN (show_bgp_neighbor_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[3]->arg, uj); if (! peer) return CMD_WARNING; @@ -13651,7 +13651,7 @@ DEFUN (ipv6_mbgp_neighbor_routes, struct peer *peer; u_char uj = use_json(argc, argv); - peer = peer_lookup_in_view (vty, NULL, argv[0], uj); + peer = peer_lookup_in_view (vty, NULL, argv[4]->arg, uj); if (! peer) return CMD_WARNING; @@ -13913,9 +13913,9 @@ DEFUN (bgp_distance, bgp = vty->index; - bgp->distance_ebgp = atoi (argv[0]); - bgp->distance_ibgp = atoi (argv[1]); - bgp->distance_local = atoi (argv[2]); + bgp->distance_ebgp = atoi (argv[2]->arg); + bgp->distance_ibgp = atoi (argv[3]->arg); + bgp->distance_local = atoi (argv[4]->arg); return CMD_SUCCESS; } @@ -13953,7 +13953,7 @@ DEFUN (bgp_distance_source, "Administrative distance\n" "IP source prefix\n") { - bgp_distance_set (vty, argv[0], argv[1], NULL); + bgp_distance_set (vty, argv[1]->arg, argv[2]->arg, NULL); return CMD_SUCCESS; } @@ -13965,7 +13965,7 @@ DEFUN (no_bgp_distance_source, "Administrative distance\n" "IP source prefix\n") { - bgp_distance_unset (vty, argv[0], argv[1], NULL); + bgp_distance_unset (vty, argv[2]->arg, argv[3]->arg, NULL); return CMD_SUCCESS; } @@ -13977,7 +13977,7 @@ DEFUN (bgp_distance_source_access_list, "IP source prefix\n" "Access list name\n") { - bgp_distance_set (vty, argv[0], argv[1], argv[2]); + bgp_distance_set (vty, argv[1]->arg, argv[2]->arg, argv[3]->arg); return CMD_SUCCESS; } @@ -13990,7 +13990,7 @@ DEFUN (no_bgp_distance_source_access_list, "IP source prefix\n" "Access list name\n") { - bgp_distance_unset (vty, argv[0], argv[1], argv[2]); + bgp_distance_unset (vty, argv[2]->arg, argv[3]->arg, argv[4]->arg); return CMD_SUCCESS; } @@ -14012,14 +14012,14 @@ DEFUN (bgp_damp_set, if (argc == 4) { - half = atoi (argv[0]) * 60; - reuse = atoi (argv[1]); - suppress = atoi (argv[2]); - max = atoi (argv[3]) * 60; + half = atoi (argv[2]->arg) * 60; + reuse = atoi (argv[3]->arg); + suppress = atoi (argv[4]->arg); + max = atoi (argv[5]->arg) * 60; } else if (argc == 1) { - half = atoi (argv[0]) * 60; + half = atoi (argv[2]->arg) * 60; max = 4 * half; } @@ -14246,7 +14246,7 @@ DEFUN (clear_ip_bgp_dampening_prefix, "Clear route flap dampening information\n" "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n") { - return bgp_clear_damp_route (vty, NULL, argv[0], AFI_IP, + return bgp_clear_damp_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, NULL, 1); } @@ -14259,7 +14259,7 @@ DEFUN (clear_ip_bgp_dampening_address, "Clear route flap dampening information\n" "Network to clear damping information\n") { - return bgp_clear_damp_route (vty, NULL, argv[0], AFI_IP, + return bgp_clear_damp_route (vty, NULL, argv[4]->arg, AFI_IP, SAFI_UNICAST, NULL, 0); } @@ -14276,7 +14276,7 @@ DEFUN (clear_ip_bgp_dampening_address_mask, int ret; char prefix_str[BUFSIZ]; - ret = netmask_str2prefix_str (argv[0], argv[1], prefix_str); + ret = netmask_str2prefix_str (argv[4]->arg, argv[5]->arg, prefix_str); if (! ret) { vty_out (vty, "%% Inconsistent address and mask%s", VTY_NEWLINE); |