summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_vty.c18
-rw-r--r--bgpd/rfapi/bgp_rfapi_cfg.c12
-rw-r--r--isisd/isisd.c2
-rw-r--r--ldpd/Makefile.am4
-rw-r--r--lib/distribute.c16
-rw-r--r--lib/grammar_sandbox.c2
-rw-r--r--lib/keychain.c4
-rw-r--r--lib/ns.c2
-rw-r--r--lib/routemap.c4
-rw-r--r--lib/vrf.c2
-rw-r--r--lib/vty.c12
-rw-r--r--ospf6d/ospf6_top.c2
-rw-r--r--ospfd/ospf_vty.c2
-rw-r--r--ripd/ripd.c2
-rw-r--r--ripngd/ripngd.c2
-rwxr-xr-xvtysh/extract.pl.in59
-rw-r--r--zebra/interface.c4
17 files changed, 47 insertions, 102 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index dba336051a..e94de682d5 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -806,7 +806,7 @@ DEFUN (no_auto_summary,
}
/* "router bgp" commands. */
-DEFUN (router_bgp,
+DEFUN_NOSH (router_bgp,
router_bgp_cmd,
"router bgp [(1-4294967295) [<view|vrf> WORD]]",
ROUTER_STR
@@ -5647,7 +5647,7 @@ DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS);
}
-DEFUN (address_family_ipv4_safi,
+DEFUN_NOSH (address_family_ipv4_safi,
address_family_ipv4_safi_cmd,
"address-family ipv4 [<unicast|multicast|vpn|encap>]",
"Enter Address Family command mode\n"
@@ -5680,7 +5680,7 @@ DEFUN (address_family_ipv4_safi,
return CMD_SUCCESS;
}
-DEFUN (address_family_ipv6_safi,
+DEFUN_NOSH (address_family_ipv6_safi,
address_family_ipv6_safi_cmd,
"address-family ipv6 [<unicast|multicast|vpn|encap>]",
"Enter Address Family command mode\n"
@@ -5714,7 +5714,7 @@ DEFUN (address_family_ipv6_safi,
}
#ifdef KEEP_OLD_VPN_COMMANDS
-DEFUN (address_family_vpnv4,
+DEFUN_NOSH (address_family_vpnv4,
address_family_vpnv4_cmd,
"address-family vpnv4 [unicast]",
"Enter Address Family command mode\n"
@@ -5725,7 +5725,7 @@ DEFUN (address_family_vpnv4,
return CMD_SUCCESS;
}
-DEFUN (address_family_vpnv6,
+DEFUN_NOSH (address_family_vpnv6,
address_family_vpnv6_cmd,
"address-family vpnv6 [unicast]",
"Enter Address Family command mode\n"
@@ -5737,7 +5737,7 @@ DEFUN (address_family_vpnv6,
}
#endif
-DEFUN (address_family_encap,
+DEFUN_NOSH (address_family_encap,
address_family_encap_cmd,
"address-family <encap|encapv4>",
"Enter Address Family command mode\n"
@@ -5749,7 +5749,7 @@ DEFUN (address_family_encap,
}
-DEFUN (address_family_encapv6,
+DEFUN_NOSH (address_family_encapv6,
address_family_encapv6_cmd,
"address-family encapv6",
"Enter Address Family command mode\n"
@@ -5759,7 +5759,7 @@ DEFUN (address_family_encapv6,
return CMD_SUCCESS;
}
-DEFUN (address_family_evpn,
+DEFUN_NOSH (address_family_evpn,
address_family_evpn_cmd,
"address-family <l2vpn evpn>",
"Enter Address Family command mode\n"
@@ -5771,7 +5771,7 @@ DEFUN (address_family_evpn,
return CMD_SUCCESS;
}
-DEFUN (exit_address_family,
+DEFUN_NOSH (exit_address_family,
exit_address_family_cmd,
"exit-address-family",
"Exit from Address Family configuration mode\n")
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 71086c8758..aa48b4924a 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -323,7 +323,7 @@ DEFUN (vnc_advertise_un_method,
*-----------------------------------------------------------------------*/
-DEFUN (vnc_defaults,
+DEFUN_NOSH (vnc_defaults,
vnc_defaults_cmd,
"vnc defaults", VNC_CONFIG_STR "Configure default NVE group\n")
{
@@ -2419,7 +2419,7 @@ vnc_routemap_event (route_map_event_t type, /* ignored */
*-----------------------------------------------------------------------*/
-DEFUN (vnc_nve_group,
+DEFUN_NOSH (vnc_nve_group,
vnc_nve_group_cmd,
"vnc nve-group NAME",
VNC_CONFIG_STR "Configure a NVE group\n" "Group name\n")
@@ -3223,7 +3223,7 @@ DEFUN (vnc_nve_group_responselifetime,
* with the lack of rigorous level control in the command handler.
* TBD fix command handler.
*/
-DEFUN (exit_vnc,
+DEFUN_NOSH (exit_vnc,
exit_vnc_cmd,
"exit-vnc",
"Exit VNC configuration mode\n")
@@ -3255,7 +3255,7 @@ static struct cmd_node bgp_vnc_nve_group_node = {
* Note there are two types of NVEs, one for VPNs one for RFP NVEs
*-----------------------------------------------------------------------*/
-DEFUN (vnc_vrf_policy,
+DEFUN_NOSH (vnc_vrf_policy,
vnc_vrf_policy_cmd,
"vrf-policy NAME",
"Configure a VRF policy group\n"
@@ -3720,7 +3720,7 @@ DEFUN (vnc_vrf_policy_rd,
return CMD_SUCCESS;
}
-DEFUN (exit_vrf_policy,
+DEFUN_NOSH (exit_vrf_policy,
exit_vrf_policy_cmd,
"exit-vrf-policy",
"Exit VRF policy configuration mode\n")
@@ -3743,7 +3743,7 @@ static struct cmd_node bgp_vrf_policy_node = {
*-----------------------------------------------------------------------*/
-DEFUN (vnc_l2_group,
+DEFUN_NOSH (vnc_l2_group,
vnc_l2_group_cmd,
"vnc l2-group NAME",
VNC_CONFIG_STR "Configure a L2 group\n" "Group name\n")
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 2863d2f678..f226c4a1f3 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1576,7 +1576,7 @@ DEFUN (show_database,
/*
* 'router isis' command
*/
-DEFUN (router_isis,
+DEFUN_NOSH (router_isis,
router_isis_cmd,
"router isis WORD",
ROUTER_STR
diff --git a/ldpd/Makefile.am b/ldpd/Makefile.am
index 42e54138aa..19f819ae36 100644
--- a/ldpd/Makefile.am
+++ b/ldpd/Makefile.am
@@ -24,7 +24,9 @@ noinst_HEADERS = \
control.h lde.h ldpd.h ldpe.h ldp.h log.h ldp_debug.h ldp_vty.h
ldp_vty_cmds.c: $(srcdir)/ldp_vty.xml $(srcdir)/../tools/xml2cli.pl
- @PERL@ $(srcdir)/../tools/xml2cli.pl $(srcdir)/ldp_vty.xml > $@
+ @PERL@ $(srcdir)/../tools/xml2cli.pl $(srcdir)/ldp_vty.xml | \
+ sed -e 's%DEFUN \((ldp_\(interface_\|mpls_ldp\|address_family\|l2vpn_word\|member_pseudo\)\)%DEFUN_NOSH \1%' \
+ > $@
ldpd_SOURCES = ldpd.c
ldpd_LDADD = libldp.a ../lib/libfrr.la @LIBCAP@
diff --git a/lib/distribute.c b/lib/distribute.c
index 2e76e352cb..01c338f177 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -524,14 +524,14 @@ distribute_list_init (int node)
disthash = hash_create (distribute_hash_make,
(int (*) (const void *, const void *)) distribute_cmp);
- install_element (node, &distribute_list_cmd);
- install_element (node, &no_distribute_list_cmd);
-/*
- install_element (RIP_NODE, &distribute_list_cmd);
- install_element (RIP_NODE, &no_distribute_list_cmd);
- install_element (RIPNG_NODE, &distribute_list_cmd);
- install_element (RIPNG_NODE, &no_distribute_list_cmd);
- */
+ /* vtysh command-extraction doesn't grok install_element(node, ) */
+ if (node == RIP_NODE) {
+ install_element (RIP_NODE, &distribute_list_cmd);
+ install_element (RIP_NODE, &no_distribute_list_cmd);
+ } else if (node == RIPNG_NODE) {
+ install_element (RIPNG_NODE, &distribute_list_cmd);
+ install_element (RIPNG_NODE, &no_distribute_list_cmd);
+ }
/* install v6 */
if (node == RIPNG_NODE) {
diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index e3a7c979fc..97de943216 100644
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -411,7 +411,7 @@ DEFUN (grammar_findambig,
{
int same = prev && !strcmp (prev->cmd, cur->cmd);
if (printall && !same)
- vty_out (vty, "'%s'%s", cur->cmd, VTY_NEWLINE);
+ vty_out (vty, "'%s' [%x]%s", cur->cmd, cur->el->daemon, VTY_NEWLINE);
if (same)
{
vty_out (vty, "'%s' AMBIGUOUS:%s", cur->cmd, VTY_NEWLINE);
diff --git a/lib/keychain.c b/lib/keychain.c
index cd8039b95b..95a2c8e599 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -240,7 +240,7 @@ key_delete (struct keychain *keychain, struct key *key)
key_free (key);
}
-DEFUN (key_chain,
+DEFUN_NOSH (key_chain,
key_chain_cmd,
"key chain WORD",
"Authentication key management\n"
@@ -280,7 +280,7 @@ DEFUN (no_key_chain,
return CMD_SUCCESS;
}
-DEFUN (key,
+DEFUN_NOSH (key,
key_cmd,
"key (0-2147483647)",
"Configure a key\n"
diff --git a/lib/ns.c b/lib/ns.c
index 1673ac0a66..ae0a24668e 100644
--- a/lib/ns.c
+++ b/lib/ns.c
@@ -304,7 +304,7 @@ ns_netns_pathname (struct vty *vty, const char *name)
return pathname;
}
-DEFUN (ns_netns,
+DEFUN_NOSH (ns_netns,
ns_netns_cmd,
"logical-router (1-65535) ns NAME",
"Enable a logical-router\n"
diff --git a/lib/routemap.c b/lib/routemap.c
index 1647ac3668..cd34ffaae5 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -2538,7 +2538,7 @@ DEFUN (no_set_tag,
-DEFUN (route_map,
+DEFUN_NOSH (route_map,
route_map_cmd,
"route-map WORD <deny|permit> (1-65535)",
"Create route-map or enter route-map command mode\n"
@@ -2754,7 +2754,7 @@ DEFUN (no_rmap_continue,
}
-DEFUN (rmap_show_name,
+DEFUN_NOSH (rmap_show_name,
rmap_show_name_cmd,
"show route-map [WORD]",
SHOW_STR
diff --git a/lib/vrf.c b/lib/vrf.c
index ab7b43b078..ce57bb6e7a 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -474,7 +474,7 @@ vrf_socket (int domain, int type, int protocol, vrf_id_t vrf_id)
}
/* vrf CLI commands */
-DEFUN (vrf,
+DEFUN_NOSH (vrf,
vrf_cmd,
"vrf NAME",
"Select a VRF to configure\n"
diff --git a/lib/vty.c b/lib/vty.c
index c6fc1e1b14..36755b1d95 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2660,7 +2660,7 @@ vty_event (enum event event, int sock, struct vty *vty)
}
}
-DEFUN (config_who,
+DEFUN_NOSH (config_who,
config_who_cmd,
"who",
"Display who is on vty\n")
@@ -2677,7 +2677,7 @@ DEFUN (config_who,
}
/* Move to vty configuration mode. */
-DEFUN (line_vty,
+DEFUN_NOSH (line_vty,
line_vty_cmd,
"line vty",
"Configure a terminal line\n"
@@ -2867,7 +2867,7 @@ DEFUN (no_service_advanced_vty,
return CMD_SUCCESS;
}
-DEFUN (terminal_monitor,
+DEFUN_NOSH (terminal_monitor,
terminal_monitor_cmd,
"terminal monitor",
"Set terminal line parameters\n"
@@ -2877,7 +2877,7 @@ DEFUN (terminal_monitor,
return CMD_SUCCESS;
}
-DEFUN (terminal_no_monitor,
+DEFUN_NOSH (terminal_no_monitor,
terminal_no_monitor_cmd,
"terminal no monitor",
"Set terminal line parameters\n"
@@ -2888,7 +2888,7 @@ DEFUN (terminal_no_monitor,
return CMD_SUCCESS;
}
-DEFUN (no_terminal_monitor,
+DEFUN_NOSH (no_terminal_monitor,
no_terminal_monitor_cmd,
"no terminal monitor",
NO_STR
@@ -2899,7 +2899,7 @@ DEFUN (no_terminal_monitor,
}
-DEFUN (show_history,
+DEFUN_NOSH (show_history,
show_history_cmd,
"show history",
SHOW_STR
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index a367d1e141..74e49a21bb 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -288,7 +288,7 @@ ospf6_maxage_remove (struct ospf6 *o)
}
/* start ospf6 */
-DEFUN (router_ospf6,
+DEFUN_NOSH (router_ospf6,
router_ospf6_cmd,
"router ospf6",
ROUTER_STR
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 71befc84b5..c51e176c74 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -144,7 +144,7 @@ ospf_oi_count (struct interface *ifp)
return i;
}
-DEFUN (router_ospf,
+DEFUN_NOSH (router_ospf,
router_ospf_cmd,
"router ospf [(1-65535)]",
"Enable a routing process\n"
diff --git a/ripd/ripd.c b/ripd/ripd.c
index 82e460ced8..45d5bf1ead 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2802,7 +2802,7 @@ rip_event (enum rip_event event, int sock)
}
}
-DEFUN (router_rip,
+DEFUN_NOSH (router_rip,
router_rip_cmd,
"router rip",
"Enable a routing process\n"
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index caad85457a..a883bec3c4 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2215,7 +2215,7 @@ DEFUN (clear_ipv6_rip,
return CMD_SUCCESS;
}
-DEFUN (router_ripng,
+DEFUN_NOSH (router_ripng,
router_ripng_cmd,
"router ripng",
"Enable a routing process\n"
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index c1b1d705a4..5510482485 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -33,62 +33,6 @@ print <<EOF;
EOF
-$ignore{'"interface IFNAME"'} = "ignore";
-$ignore{'"interface IFNAME " "vrf (0-65535)"'} = "ignore";
-$ignore{'"interface IFNAME " "vrf NAME"'} = "ignore";
-$ignore{'"link-params"'} = "ignore";
-$ignore{'"vrf NAME"'} = "ignore";
-$ignore{'"ip vrf NAME"'} = "ignore";
-$ignore{'"router rip"'} = "ignore";
-$ignore{'"router ripng"'} = "ignore";
-$ignore{'"router ospf"'} = "ignore";
-$ignore{'"router ospf (1-65535)"'} = "ignore";
-$ignore{'"router ospf6"'} = "ignore";
-$ignore{'"mpls ldp"'} = "ignore";
-$ignore{'"l2vpn WORD type vpls"'} = "ignore";
-$ignore{'"member pseudowire IFNAME"'} = "ignore";
-$ignore{'"router bgp"'} = "ignore";
-$ignore{'"router bgp " "(1-4294967295)"'} = "ignore";
-$ignore{'"router bgp " "(1-4294967295)" " <view|vrf> WORD"'} = "ignore";
-$ignore{'"router bgp [(1-4294967295) [<view|vrf> WORD]]"'} = "ignore";
-$ignore{'"router isis WORD"'} = "ignore";
-$ignore{'"router zebra"'} = "ignore";
-$ignore{'"address-family ipv4"'} = "ignore";
-$ignore{'"address-family ipv4 [<unicast|multicast|vpn|encap>]"'} = "ignore";
-$ignore{'"address-family ipv6"'} = "ignore";
-$ignore{'"address-family ipv6 [<unicast|multicast|vpn|encap>]"'} = "ignore";
-$ignore{'"address-family vpnv4"'} = "ignore";
-$ignore{'"address-family vpnv4 unicast"'} = "ignore";
-$ignore{'"address-family ipv4 vrf NAME"'} = "ignore";
-$ignore{'"address-family <encap|encapv4>"'} = "ignore";
-$ignore{'"address-family encapv6"'} = "ignore";
-$ignore{'"address-family ipv4 encap"'} = "ignore";
-$ignore{'"address-family ipv6 encap"'} = "ignore";
-$ignore{'"address-family ipv6 vpn"'} = "ignore";
-$ignore{'"address-family vpnv6"'} = "ignore";
-$ignore{'"address-family vpnv6 unicast"'} = "ignore";
-$ignore{'"exit-address-family"'} = "ignore";
-$ignore{'"exit-link-params"'} = "ignore";
-$ignore{'"vnc defaults"'} = "ignore";
-$ignore{'"vnc l2-group NAME"'} = "ignore";
-$ignore{'"vnc nve-group NAME"'} = "ignore";
-$ignore{'"exit-vnc"'} = "ignore";
-$ignore{'"key chain WORD"'} = "ignore";
-$ignore{'"key (0-2147483647)"'} = "ignore";
-$ignore{'"route-map WORD <deny|permit> (1-65535)"'} = "ignore";
-$ignore{'"show route-map"'} = "ignore";
-$ignore{'"line vty"'} = "ignore";
-$ignore{'"who"'} = "ignore";
-$ignore{'"terminal monitor"'} = "ignore";
-$ignore{'"terminal no monitor"'} = "ignore";
-$ignore{'"show history"'} = "ignore";
-$ignore{'"router ospf [(1-65535)]"'} = "ignore";
-$ignore{'"address-family vpnv6 [unicast]"'} = "ignore";
-$ignore{'"address-family vpnv4 [unicast]"'} = "ignore";
-$ignore{'"logical-router (1-65535) ns NAME"'} = "ignore";
-$ignore{'"vrf-policy NAME"' } = "ignore";
-$ignore{'"exit-vrf-policy"' } = "ignore";
-
my $cli_stomp = 0;
foreach (@ARGV) {
@@ -215,8 +159,7 @@ foreach (@ARGV) {
$ecmd =~ s/\s+$//g;
# Register $ecmd
- if (defined ($cmd2str{$ecmd})
- && ! defined ($ignore{$cmd2str{$ecmd}})) {
+ if (defined ($cmd2str{$ecmd})) {
my ($key);
$key = $enode . "," . $cmd2str{$ecmd};
$ocmd{$key} = $ecmd;
diff --git a/zebra/interface.c b/zebra/interface.c
index 9abb54cec8..e9c54a629b 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1697,7 +1697,7 @@ link_param_cmd_unset (struct interface *ifp, uint32_t type)
zebra_interface_parameters_update (ifp);
}
-DEFUN (link_params,
+DEFUN_NOSH (link_params,
link_params_cmd,
"link-params",
LINK_PARAMS_STR)
@@ -1708,7 +1708,7 @@ DEFUN (link_params,
return CMD_SUCCESS;
}
-DEFUN (exit_link_params,
+DEFUN_NOSH (exit_link_params,
exit_link_params_cmd,
"exit-link-params",
"Exit from Link Params configuration mode\n")
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-07 19:27:39 +0000