From 2511cb40e6b0e88620f26b3506b2a454a773c93d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 20 Sep 2016 21:43:46 -0400 Subject: [PATCH 1/4] lib, zebra: Fixup if.c to work in the new regime Signed-off-by: Donald Sharp --- lib/if.c | 77 +++++++++++++++++------------------------------ lib/if.h | 3 -- lib/vrf.h | 2 +- zebra/interface.c | 1 - 4 files changed, 29 insertions(+), 54 deletions(-) diff --git a/lib/if.c b/lib/if.c index bd6079c0fd..01baa5392a 100644 --- a/lib/if.c +++ b/lib/if.c @@ -750,36 +750,37 @@ if_sunwzebra_get (const char *name, size_t nlen, vrf_id_t vrf_id) DEFUN (interface, interface_cmd, - "interface IFNAME", + "interface IFNAME" VRF_CMD_STR_OPT, "Select an interface to configure\n" - "Interface's name\n") + "Interface's name\n" + VRF_CMD_HELP_STR) { struct interface *ifp; size_t sl; vrf_id_t vrf_id = VRF_DEFAULT; - if ((sl = strlen(argv[0])) > INTERFACE_NAMSIZ) + if ((sl = strlen(argv[0]->arg)) > INTERFACE_NAMSIZ) { vty_out (vty, "%% Interface name %s is invalid: length exceeds " "%d characters%s", - argv[0], INTERFACE_NAMSIZ, VTY_NEWLINE); + argv[0]->arg, INTERFACE_NAMSIZ, VTY_NEWLINE); return CMD_WARNING; } /*Pending: need proper vrf name based lookup/(possible creation of VRF) Imagine forward reference of a vrf by name in this interface config */ if (argc > 1) - VRF_GET_ID (vrf_id, argv[1]); + VRF_GET_ID (vrf_id, argv[1]->arg); #ifdef SUNOS_5 - ifp = if_sunwzebra_get (argv[0], sl, vrf_id); + ifp = if_sunwzebra_get (argv[0]->arg, sl, vrf_id); #else - ifp = if_get_by_name_len_vrf (argv[0], sl, vrf_id, 1); + ifp = if_get_by_name_len_vrf (argv[0]->arg, sl, vrf_id, 1); #endif /* SUNOS_5 */ if (!ifp) { - vty_out (vty, "%% interface %s not in %s%s", argv[0], argv[1], VTY_NEWLINE); + vty_out (vty, "%% interface %s not in %s%s", argv[0]->arg, argv[1]->arg, VTY_NEWLINE); return CMD_WARNING; } vty->index = ifp; @@ -788,32 +789,26 @@ DEFUN (interface, return CMD_SUCCESS; } -ALIAS (interface, - interface_vrf_cmd, - "interface IFNAME " VRF_CMD_STR, - "Select an interface to configure\n" - "Interface's name\n" - VRF_CMD_HELP_STR) - DEFUN_NOSH (no_interface, no_interface_cmd, - "no interface IFNAME", + "no interface IFNAME" VRF_CMD_STR_OPT, NO_STR "Delete a pseudo interface's configuration\n" - "Interface's name\n") + "Interface's name\n" + VRF_CMD_HELP_STR) { // deleting interface struct interface *ifp; vrf_id_t vrf_id = VRF_DEFAULT; if (argc > 1) - VRF_GET_ID (vrf_id, argv[1]); + VRF_GET_ID (vrf_id, argv[1]->arg); - ifp = if_lookup_by_name_vrf (argv[0], vrf_id); + ifp = if_lookup_by_name_vrf (argv[0]->arg, vrf_id); if (ifp == NULL) { - vty_out (vty, "%% Interface %s does not exist%s", argv[0], VTY_NEWLINE); + vty_out (vty, "%% Interface %s does not exist%s", argv[0]->arg, VTY_NEWLINE); return CMD_WARNING; } @@ -829,32 +824,23 @@ DEFUN_NOSH (no_interface, return CMD_SUCCESS; } -ALIAS (no_interface, - no_interface_vrf_cmd, - "no interface IFNAME " VRF_CMD_STR, - NO_STR - "Delete a pseudo interface's configuration\n" - "Interface's name\n" - VRF_CMD_HELP_STR) - DEFUN (vrf, vrf_cmd, - "vrf NAME", - "Select a VRF to configure\n" - "VRF's name\n") + VRF_CMD_STR, + VRF_CMD_HELP_STR) { struct vrf *vrfp; size_t sl; - if ((sl = strlen(argv[0])) > VRF_NAMSIZ) + if ((sl = strlen(argv[0]->arg)) > VRF_NAMSIZ) { vty_out (vty, "%% VRF name %s is invalid: length exceeds " "%d characters%s", - argv[0], VRF_NAMSIZ, VTY_NEWLINE); + argv[0]->arg, VRF_NAMSIZ, VTY_NEWLINE); return CMD_WARNING; } - vrfp = vrf_get (VRF_UNKNOWN, argv[0]); + vrfp = vrf_get (VRF_UNKNOWN, argv[0]->arg); vty->index = vrfp; vty->node = VRF_NODE; @@ -864,18 +850,17 @@ DEFUN (vrf, DEFUN_NOSH (no_vrf, no_vrf_cmd, - "no vrf NAME", + "no " VRF_CMD_STR, NO_STR - "Delete a pseudo VRF's configuration\n" - "VRF's name\n") + VRF_CMD_HELP_STR) { struct vrf *vrfp; - vrfp = vrf_list_lookup_by_name (argv[0]); + vrfp = vrf_list_lookup_by_name (argv[0]->arg); if (vrfp == NULL) { - vty_out (vty, "%% VRF %s does not exist%s", argv[0], VTY_NEWLINE); + vty_out (vty, "%% VRF %s does not exist%s", argv[0]->arg, VTY_NEWLINE); return CMD_WARNING; } @@ -895,9 +880,10 @@ DEFUN_NOSH (no_vrf, /* For debug purpose. */ DEFUN (show_address, show_address_cmd, - "show address", + "show address" VRF_CMD_STR_OPT, SHOW_STR - "address\n") + "address\n" + VRF_CMD_HELP_STR) { struct listnode *node; struct listnode *node2; @@ -907,7 +893,7 @@ DEFUN (show_address, vrf_id_t vrf_id = VRF_DEFAULT; if (argc > 0) - VRF_GET_ID (vrf_id, argv[0]); + VRF_GET_ID (vrf_id, argv[0]->arg); for (ALL_LIST_ELEMENTS_RO (vrf_iflist (vrf_id), node, ifp)) { @@ -923,13 +909,6 @@ DEFUN (show_address, return CMD_SUCCESS; } -ALIAS (show_address, - show_address_vrf_cmd, - "show address " VRF_CMD_STR, - SHOW_STR - "address\n" - VRF_CMD_HELP_STR) - DEFUN (show_address_vrf_all, show_address_vrf_all_cmd, "show address " VRF_ALL_CMD_STR, diff --git a/lib/if.h b/lib/if.h index d1875e695a..4913d8c8b0 100644 --- a/lib/if.h +++ b/lib/if.h @@ -491,12 +491,9 @@ extern struct cmd_element interface_desc_cmd; extern struct cmd_element no_interface_desc_cmd; extern struct cmd_element interface_cmd; extern struct cmd_element no_interface_cmd; -extern struct cmd_element interface_vrf_cmd; -extern struct cmd_element no_interface_vrf_cmd; extern struct cmd_element interface_pseudo_cmd; extern struct cmd_element no_interface_pseudo_cmd; extern struct cmd_element show_address_cmd; -extern struct cmd_element show_address_vrf_cmd; extern struct cmd_element show_address_vrf_all_cmd; extern struct cmd_element vrf_cmd; extern struct cmd_element no_vrf_cmd; diff --git a/lib/vrf.h b/lib/vrf.h index dcc115563d..c4260769a6 100644 --- a/lib/vrf.h +++ b/lib/vrf.h @@ -50,7 +50,7 @@ enum { /* * The command strings */ - +#define VRF_CMD_STR_OPT "[vrf NAME]" #define VRF_CMD_STR "vrf NAME" #define VRF_CMD_HELP_STR "Specify the VRF\nThe VRF name\n" diff --git a/zebra/interface.c b/zebra/interface.c index 9be97e2214..0546cb8f9b 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -2960,7 +2960,6 @@ zebra_if_init (void) install_element (CONFIG_NODE, &zebra_interface_cmd); install_element (CONFIG_NODE, &zebra_interface_vrf_cmd); install_element (CONFIG_NODE, &no_interface_cmd); - install_element (CONFIG_NODE, &no_interface_vrf_cmd); install_default (INTERFACE_NODE); install_element (INTERFACE_NODE, &interface_desc_cmd); install_element (INTERFACE_NODE, &no_interface_desc_cmd); From c1ad0838e8de8184f6122b13472a60dbca009aa7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 20 Sep 2016 21:49:32 -0400 Subject: [PATCH 2/4] lib: Fix vty.c to compile with new parser --- lib/vty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/vty.c b/lib/vty.c index ff559d1705..150c33b5f4 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -2746,7 +2746,7 @@ DEFUN (exec_timeout_min, "Set timeout value\n" "Timeout value in minutes\n") { - return exec_timeout (vty, argv[0], NULL); + return exec_timeout (vty, argv[0]->arg, NULL); } DEFUN (exec_timeout_sec, @@ -2756,7 +2756,7 @@ DEFUN (exec_timeout_sec, "Timeout in minutes\n" "Timeout in seconds\n") { - return exec_timeout (vty, argv[0], argv[1]); + return exec_timeout (vty, argv[0]->arg, argv[1]->arg); } DEFUN (no_exec_timeout, @@ -2778,7 +2778,7 @@ DEFUN (vty_access_class, if (vty_accesslist_name) XFREE(MTYPE_VTY, vty_accesslist_name); - vty_accesslist_name = XSTRDUP(MTYPE_VTY, argv[0]); + vty_accesslist_name = XSTRDUP(MTYPE_VTY, argv[0]->arg); return CMD_SUCCESS; } @@ -2791,7 +2791,7 @@ DEFUN (no_vty_access_class, "Filter connections based on an IP access list\n" "IP access list\n") { - if (! vty_accesslist_name || (argc && strcmp(vty_accesslist_name, argv[0]))) + if (! vty_accesslist_name || (argc && strcmp(vty_accesslist_name, argv[0]->arg))) { vty_out (vty, "Access-class is not currently applied to vty%s", VTY_NEWLINE); @@ -2817,7 +2817,7 @@ DEFUN (vty_ipv6_access_class, if (vty_ipv6_accesslist_name) XFREE(MTYPE_VTY, vty_ipv6_accesslist_name); - vty_ipv6_accesslist_name = XSTRDUP(MTYPE_VTY, argv[0]); + vty_ipv6_accesslist_name = XSTRDUP(MTYPE_VTY, argv[0]->arg); return CMD_SUCCESS; } @@ -2832,7 +2832,7 @@ DEFUN (no_vty_ipv6_access_class, "IPv6 access list\n") { if (! vty_ipv6_accesslist_name || - (argc && strcmp(vty_ipv6_accesslist_name, argv[0]))) + (argc && strcmp(vty_ipv6_accesslist_name, argv[0]->arg))) { vty_out (vty, "IPv6 access-class is not currently applied to vty%s", VTY_NEWLINE); From 5720e4ff9518275b23c28a3107a46d833eb387fa Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 20 Sep 2016 21:52:22 -0400 Subject: [PATCH 3/4] lib: Fixup ns.c --- lib/ns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ns.c b/lib/ns.c index 556350ed17..e05ef391f4 100644 --- a/lib/ns.c +++ b/lib/ns.c @@ -559,12 +559,12 @@ DEFUN (ns_netns, { ns_id_t ns_id = NS_DEFAULT; struct ns *ns = NULL; - char *pathname = ns_netns_pathname (vty, argv[1]); + char *pathname = ns_netns_pathname (vty, argv[1]->arg); if (!pathname) return CMD_WARNING; - VTY_GET_INTEGER ("NS ID", ns_id, argv[0]); + VTY_GET_INTEGER ("NS ID", ns_id, argv[0]->arg); ns = ns_get (ns_id); if (ns->name && strcmp (ns->name, pathname) != 0) @@ -598,12 +598,12 @@ DEFUN (no_ns_netns, { ns_id_t ns_id = NS_DEFAULT; struct ns *ns = NULL; - char *pathname = ns_netns_pathname (vty, argv[1]); + char *pathname = ns_netns_pathname (vty, argv[1]->arg); if (!pathname) return CMD_WARNING; - VTY_GET_INTEGER ("NS ID", ns_id, argv[0]); + VTY_GET_INTEGER ("NS ID", ns_id, argv[0]->arg); ns = ns_lookup (ns_id); if (!ns) From c65a0fe1c664b5438a13aa1d756c121ff2fb7a80 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 20 Sep 2016 21:58:16 -0400 Subject: [PATCH 4/4] lib: Fixup plist.c --- lib/plist.c | 208 ++++++++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/lib/plist.c b/lib/plist.c index eedb830c1a..94556af9ee 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1415,8 +1415,8 @@ DEFUN (ip_prefix_list, "IP prefix /, e.g., 35.0.0.0/8\n" "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, - argv[1], argv[2], NULL, NULL); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, NULL, + argv[1]->arg, argv[2]->arg, NULL, NULL); } DEFUN (ip_prefix_list_ge, @@ -1431,8 +1431,8 @@ DEFUN (ip_prefix_list_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], argv[3], NULL); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, NULL); } DEFUN (ip_prefix_list_ge_le, @@ -1449,8 +1449,8 @@ DEFUN (ip_prefix_list_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], argv[3], argv[4]); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, argv[4]->arg); } DEFUN (ip_prefix_list_le, @@ -1465,8 +1465,8 @@ DEFUN (ip_prefix_list_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], NULL, argv[3]); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, NULL, argv[3]->arg); } DEFUN (ip_prefix_list_le_ge, @@ -1483,8 +1483,8 @@ DEFUN (ip_prefix_list_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], argv[4], argv[3]); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[4]->arg, argv[3]->arg); } DEFUN (ip_prefix_list_seq, @@ -1500,8 +1500,8 @@ DEFUN (ip_prefix_list_seq, "IP prefix /, e.g., 35.0.0.0/8\n" "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], NULL, NULL); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, NULL); } DEFUN (ip_prefix_list_seq_ge, @@ -1518,8 +1518,8 @@ DEFUN (ip_prefix_list_seq_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], argv[4], NULL); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, NULL); } DEFUN (ip_prefix_list_seq_ge_le, @@ -1538,8 +1538,8 @@ DEFUN (ip_prefix_list_seq_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], argv[4], argv[5]); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, argv[5]->arg); } DEFUN (ip_prefix_list_seq_le, @@ -1556,8 +1556,8 @@ DEFUN (ip_prefix_list_seq_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], NULL, argv[4]); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, argv[4]->arg); } DEFUN (ip_prefix_list_seq_le_ge, @@ -1576,8 +1576,8 @@ DEFUN (ip_prefix_list_seq_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], argv[5], argv[4]); + return vty_prefix_list_install (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[5]->arg, argv[4]->arg); } DEFUN (no_ip_prefix_list, @@ -1588,7 +1588,7 @@ DEFUN (no_ip_prefix_list, PREFIX_LIST_STR "Name of a prefix list\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, NULL, + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, NULL, NULL, NULL, NULL, NULL); } @@ -1604,8 +1604,8 @@ DEFUN (no_ip_prefix_list_prefix, "IP prefix /, e.g., 35.0.0.0/8\n" "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], NULL, NULL); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, NULL, NULL); } DEFUN (no_ip_prefix_list_ge, @@ -1621,8 +1621,8 @@ DEFUN (no_ip_prefix_list_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], argv[3], NULL); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, NULL); } DEFUN (no_ip_prefix_list_ge_le, @@ -1640,8 +1640,8 @@ DEFUN (no_ip_prefix_list_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], argv[3], argv[4]); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, argv[4]->arg); } DEFUN (no_ip_prefix_list_le, @@ -1657,8 +1657,8 @@ DEFUN (no_ip_prefix_list_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], NULL, argv[3]); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, NULL, argv[3]->arg); } DEFUN (no_ip_prefix_list_le_ge, @@ -1676,8 +1676,8 @@ DEFUN (no_ip_prefix_list_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1], - argv[2], argv[4], argv[3]); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[4]->arg, argv[3]->arg); } DEFUN (no_ip_prefix_list_seq, @@ -1694,8 +1694,8 @@ DEFUN (no_ip_prefix_list_seq, "IP prefix /, e.g., 35.0.0.0/8\n" "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], NULL, NULL); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, NULL); } DEFUN (no_ip_prefix_list_seq_ge, @@ -1713,8 +1713,8 @@ DEFUN (no_ip_prefix_list_seq_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], argv[4], NULL); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, NULL); } DEFUN (no_ip_prefix_list_seq_ge_le, @@ -1734,8 +1734,8 @@ DEFUN (no_ip_prefix_list_seq_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], argv[4], argv[5]); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, argv[5]->arg); } DEFUN (no_ip_prefix_list_seq_le, @@ -1753,8 +1753,8 @@ DEFUN (no_ip_prefix_list_seq_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], NULL, argv[4]); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, argv[4]->arg); } DEFUN (no_ip_prefix_list_seq_le_ge, @@ -1774,8 +1774,8 @@ DEFUN (no_ip_prefix_list_seq_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2], - argv[3], argv[5], argv[4]); + return vty_prefix_list_uninstall (vty, AFI_IP, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[5]->arg, argv[4]->arg); } DEFUN (ip_prefix_list_sequence_number, @@ -1812,7 +1812,7 @@ DEFUN (ip_prefix_list_description, { struct prefix_list *plist; - plist = prefix_list_get (AFI_IP, 0, argv[0]); + plist = prefix_list_get (AFI_IP, 0, argv[0]->arg); if (plist->desc) { @@ -1833,7 +1833,7 @@ DEFUN (no_ip_prefix_list_description, "Name of a prefix list\n" "Prefix-list specific description\n") { - return vty_prefix_list_desc_unset (vty, AFI_IP, argv[0]); + return vty_prefix_list_desc_unset (vty, AFI_IP, argv[0]->arg); } ALIAS (no_ip_prefix_list_description, @@ -1864,7 +1864,7 @@ DEFUN (show_ip_prefix_list_name, PREFIX_LIST_STR "Name of a prefix list\n") { - return vty_show_prefix_list (vty, AFI_IP, argv[0], NULL, normal_display); + return vty_show_prefix_list (vty, AFI_IP, argv[0]->arg, NULL, normal_display); } DEFUN (show_ip_prefix_list_name_seq, @@ -1877,7 +1877,7 @@ DEFUN (show_ip_prefix_list_name_seq, "sequence number of an entry\n" "Sequence number\n") { - return vty_show_prefix_list (vty, AFI_IP, argv[0], argv[1], sequential_display); + return vty_show_prefix_list (vty, AFI_IP, argv[0]->arg, argv[1]->arg, sequential_display); } DEFUN (show_ip_prefix_list_prefix, @@ -1889,7 +1889,7 @@ DEFUN (show_ip_prefix_list_prefix, "Name of a prefix list\n" "IP prefix /, e.g., 35.0.0.0/8\n") { - return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0], argv[1], normal_display); + return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0]->arg, argv[1]->arg, normal_display); } DEFUN (show_ip_prefix_list_prefix_longer, @@ -1902,7 +1902,7 @@ DEFUN (show_ip_prefix_list_prefix_longer, "IP prefix /, e.g., 35.0.0.0/8\n" "Lookup longer prefix\n") { - return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0], argv[1], longer_display); + return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0]->arg, argv[1]->arg, longer_display); } DEFUN (show_ip_prefix_list_prefix_first_match, @@ -1915,7 +1915,7 @@ DEFUN (show_ip_prefix_list_prefix_first_match, "IP prefix /, e.g., 35.0.0.0/8\n" "First matched prefix\n") { - return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0], argv[1], first_match_display); + return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0]->arg, argv[1]->arg, first_match_display); } DEFUN (show_ip_prefix_list_summary, @@ -1938,7 +1938,7 @@ DEFUN (show_ip_prefix_list_summary_name, "Summary of prefix lists\n" "Name of a prefix list\n") { - return vty_show_prefix_list (vty, AFI_IP, argv[0], NULL, summary_display); + return vty_show_prefix_list (vty, AFI_IP, argv[0]->arg, NULL, summary_display); } @@ -1962,7 +1962,7 @@ DEFUN (show_ip_prefix_list_detail_name, "Detail of prefix lists\n" "Name of a prefix list\n") { - return vty_show_prefix_list (vty, AFI_IP, argv[0], NULL, detail_display); + return vty_show_prefix_list (vty, AFI_IP, argv[0]->arg, NULL, detail_display); } DEFUN (clear_ip_prefix_list, @@ -1983,7 +1983,7 @@ DEFUN (clear_ip_prefix_list_name, PREFIX_LIST_STR "Name of a prefix list\n") { - return vty_clear_prefix_list (vty, AFI_IP, argv[0], NULL); + return vty_clear_prefix_list (vty, AFI_IP, argv[0]->arg, NULL); } DEFUN (clear_ip_prefix_list_name_prefix, @@ -1995,7 +1995,7 @@ DEFUN (clear_ip_prefix_list_name_prefix, "Name of a prefix list\n" "IP prefix /, e.g., 35.0.0.0/8\n") { - return vty_clear_prefix_list (vty, AFI_IP, argv[0], argv[1]); + return vty_clear_prefix_list (vty, AFI_IP, argv[0]->arg, argv[1]->arg); } #ifdef HAVE_IPV6 @@ -2010,8 +2010,8 @@ DEFUN (ipv6_prefix_list, "IPv6 prefix /, e.g., 3ffe::/16\n" "Any prefix match. Same as \"::0/0 le 128\"\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, - argv[1], argv[2], NULL, NULL); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, NULL, + argv[1]->arg, argv[2]->arg, NULL, NULL); } DEFUN (ipv6_prefix_list_ge, @@ -2026,8 +2026,8 @@ DEFUN (ipv6_prefix_list_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], argv[3], NULL); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, NULL); } DEFUN (ipv6_prefix_list_ge_le, @@ -2045,8 +2045,8 @@ DEFUN (ipv6_prefix_list_ge_le, "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], argv[3], argv[4]); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, argv[4]->arg); } DEFUN (ipv6_prefix_list_le, @@ -2061,8 +2061,8 @@ DEFUN (ipv6_prefix_list_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], NULL, argv[3]); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, NULL, argv[3]->arg); } DEFUN (ipv6_prefix_list_le_ge, @@ -2079,8 +2079,8 @@ DEFUN (ipv6_prefix_list_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], argv[4], argv[3]); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[4]->arg, argv[3]->arg); } DEFUN (ipv6_prefix_list_seq, @@ -2096,8 +2096,8 @@ DEFUN (ipv6_prefix_list_seq, "IPv6 prefix /, e.g., 3ffe::/16\n" "Any prefix match. Same as \"::0/0 le 128\"\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], NULL, NULL); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, NULL); } DEFUN (ipv6_prefix_list_seq_ge, @@ -2114,8 +2114,8 @@ DEFUN (ipv6_prefix_list_seq_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], argv[4], NULL); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, NULL); } DEFUN (ipv6_prefix_list_seq_ge_le, @@ -2134,8 +2134,8 @@ DEFUN (ipv6_prefix_list_seq_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], argv[4], argv[5]); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, argv[5]->arg); } DEFUN (ipv6_prefix_list_seq_le, @@ -2152,8 +2152,8 @@ DEFUN (ipv6_prefix_list_seq_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], NULL, argv[4]); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, argv[4]->arg); } DEFUN (ipv6_prefix_list_seq_le_ge, @@ -2172,8 +2172,8 @@ DEFUN (ipv6_prefix_list_seq_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], argv[5], argv[4]); + return vty_prefix_list_install (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[5]->arg, argv[4]->arg); } DEFUN (no_ipv6_prefix_list, @@ -2184,7 +2184,7 @@ DEFUN (no_ipv6_prefix_list, PREFIX_LIST_STR "Name of a prefix list\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, NULL, + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, NULL, NULL, NULL, NULL, NULL); } @@ -2200,8 +2200,8 @@ DEFUN (no_ipv6_prefix_list_prefix, "IPv6 prefix /, e.g., 3ffe::/16\n" "Any prefix match. Same as \"::0/0 le 128\"\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], NULL, NULL); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, NULL, NULL); } DEFUN (no_ipv6_prefix_list_ge, @@ -2217,8 +2217,8 @@ DEFUN (no_ipv6_prefix_list_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], argv[3], NULL); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, NULL); } DEFUN (no_ipv6_prefix_list_ge_le, @@ -2236,8 +2236,8 @@ DEFUN (no_ipv6_prefix_list_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], argv[3], argv[4]); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[3]->arg, argv[4]->arg); } DEFUN (no_ipv6_prefix_list_le, @@ -2253,8 +2253,8 @@ DEFUN (no_ipv6_prefix_list_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], NULL, argv[3]); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, NULL, argv[3]->arg); } DEFUN (no_ipv6_prefix_list_le_ge, @@ -2272,8 +2272,8 @@ DEFUN (no_ipv6_prefix_list_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1], - argv[2], argv[4], argv[3]); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, NULL, argv[1]->arg, + argv[2]->arg, argv[4]->arg, argv[3]->arg); } DEFUN (no_ipv6_prefix_list_seq, @@ -2290,8 +2290,8 @@ DEFUN (no_ipv6_prefix_list_seq, "IPv6 prefix /, e.g., 3ffe::/16\n" "Any prefix match. Same as \"::0/0 le 128\"\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], NULL, NULL); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, NULL); } DEFUN (no_ipv6_prefix_list_seq_ge, @@ -2309,8 +2309,8 @@ DEFUN (no_ipv6_prefix_list_seq_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], argv[4], NULL); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, NULL); } DEFUN (no_ipv6_prefix_list_seq_ge_le, @@ -2330,8 +2330,8 @@ DEFUN (no_ipv6_prefix_list_seq_ge_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], argv[4], argv[5]); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[4]->arg, argv[5]->arg); } DEFUN (no_ipv6_prefix_list_seq_le, @@ -2349,8 +2349,8 @@ DEFUN (no_ipv6_prefix_list_seq_le, "Maximum prefix length to be matched\n" "Maximum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], NULL, argv[4]); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, NULL, argv[4]->arg); } DEFUN (no_ipv6_prefix_list_seq_le_ge, @@ -2370,8 +2370,8 @@ DEFUN (no_ipv6_prefix_list_seq_le_ge, "Minimum prefix length to be matched\n" "Minimum prefix length\n") { - return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2], - argv[3], argv[5], argv[4]); + return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, argv[2]->arg, + argv[3]->arg, argv[5]->arg, argv[4]->arg); } DEFUN (ipv6_prefix_list_sequence_number, @@ -2408,7 +2408,7 @@ DEFUN (ipv6_prefix_list_description, { struct prefix_list *plist; - plist = prefix_list_get (AFI_IP6, 0, argv[0]); + plist = prefix_list_get (AFI_IP6, 0, argv[0]->arg); if (plist->desc) { @@ -2429,7 +2429,7 @@ DEFUN (no_ipv6_prefix_list_description, "Name of a prefix list\n" "Prefix-list specific description\n") { - return vty_prefix_list_desc_unset (vty, AFI_IP6, argv[0]); + return vty_prefix_list_desc_unset (vty, AFI_IP6, argv[0]->arg); } ALIAS (no_ipv6_prefix_list_description, @@ -2460,7 +2460,7 @@ DEFUN (show_ipv6_prefix_list_name, PREFIX_LIST_STR "Name of a prefix list\n") { - return vty_show_prefix_list (vty, AFI_IP6, argv[0], NULL, normal_display); + return vty_show_prefix_list (vty, AFI_IP6, argv[0]->arg, NULL, normal_display); } DEFUN (show_ipv6_prefix_list_name_seq, @@ -2473,7 +2473,7 @@ DEFUN (show_ipv6_prefix_list_name_seq, "sequence number of an entry\n" "Sequence number\n") { - return vty_show_prefix_list (vty, AFI_IP6, argv[0], argv[1], sequential_display); + return vty_show_prefix_list (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, sequential_display); } DEFUN (show_ipv6_prefix_list_prefix, @@ -2485,7 +2485,7 @@ DEFUN (show_ipv6_prefix_list_prefix, "Name of a prefix list\n" "IPv6 prefix /, e.g., 3ffe::/16\n") { - return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0], argv[1], normal_display); + return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, normal_display); } DEFUN (show_ipv6_prefix_list_prefix_longer, @@ -2498,7 +2498,7 @@ DEFUN (show_ipv6_prefix_list_prefix_longer, "IPv6 prefix /, e.g., 3ffe::/16\n" "Lookup longer prefix\n") { - return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0], argv[1], longer_display); + return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, longer_display); } DEFUN (show_ipv6_prefix_list_prefix_first_match, @@ -2511,7 +2511,7 @@ DEFUN (show_ipv6_prefix_list_prefix_first_match, "IPv6 prefix /, e.g., 3ffe::/16\n" "First matched prefix\n") { - return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0], argv[1], first_match_display); + return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0]->arg, argv[1]->arg, first_match_display); } DEFUN (show_ipv6_prefix_list_summary, @@ -2534,7 +2534,7 @@ DEFUN (show_ipv6_prefix_list_summary_name, "Summary of prefix lists\n" "Name of a prefix list\n") { - return vty_show_prefix_list (vty, AFI_IP6, argv[0], NULL, summary_display); + return vty_show_prefix_list (vty, AFI_IP6, argv[0]->arg, NULL, summary_display); } DEFUN (show_ipv6_prefix_list_detail, @@ -2557,7 +2557,7 @@ DEFUN (show_ipv6_prefix_list_detail_name, "Detail of prefix lists\n" "Name of a prefix list\n") { - return vty_show_prefix_list (vty, AFI_IP6, argv[0], NULL, detail_display); + return vty_show_prefix_list (vty, AFI_IP6, argv[0]->arg, NULL, detail_display); } DEFUN (clear_ipv6_prefix_list, @@ -2578,7 +2578,7 @@ DEFUN (clear_ipv6_prefix_list_name, PREFIX_LIST_STR "Name of a prefix list\n") { - return vty_clear_prefix_list (vty, AFI_IP6, argv[0], NULL); + return vty_clear_prefix_list (vty, AFI_IP6, argv[0]->arg, NULL); } DEFUN (clear_ipv6_prefix_list_name_prefix, @@ -2590,7 +2590,7 @@ DEFUN (clear_ipv6_prefix_list_name_prefix, "Name of a prefix list\n" "IPv6 prefix /, e.g., 3ffe::/16\n") { - return vty_clear_prefix_list (vty, AFI_IP6, argv[0], argv[1]); + return vty_clear_prefix_list (vty, AFI_IP6, argv[0]->arg, argv[1]->arg); } #endif /* HAVE_IPV6 */