proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-02-01 18:56:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/vtysh: fix duplicate installation of some vty commands

Browse Source 
This is a followup to commits 735e62 and 0b1442, where we forgot to apply
the same VIEW/ENABLE consolidation logic to vtysh. Also, we can't call
install_default() for the ENABLE node because some of the vty commands
installed by this function were already installed in the VIEW node before.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2016-10-12 12:39:02 -03:00 committed by Donald Sharp
parent 039eaca367
commit 6694f68c3f
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/command.c
View File

@ -4220,10 +4220,15 @@ cmd_init (int terminal)
if (terminal)
{
install_default (ENABLE_NODE);
install_element (ENABLE_NODE, &config_end_cmd);
install_element (ENABLE_NODE, &config_disable_cmd);
install_element (ENABLE_NODE, &config_terminal_cmd);
install_element (ENABLE_NODE, &copy_runningconfig_startupconfig_cmd);
install_element (ENABLE_NODE, &config_write_terminal_cmd);
install_element (ENABLE_NODE, &config_write_file_cmd);
install_element (ENABLE_NODE, &config_write_memory_cmd);
install_element (ENABLE_NODE, &config_write_cmd);
install_element (ENABLE_NODE, &show_running_config_cmd);
}
install_element (ENABLE_NODE, &show_startup_config_cmd);

22
vtysh/vtysh.c
View File

@ -3186,7 +3186,6 @@ vtysh_init_vty (void)
install_node (&vty_node, NULL);
vtysh_install_default (VIEW_NODE);
vtysh_install_default (ENABLE_NODE);
vtysh_install_default (CONFIG_NODE);
vtysh_install_default (BGP_NODE);
vtysh_install_default (RIP_NODE);
@ -3233,8 +3232,6 @@ vtysh_init_vty (void)
install_element (VIEW_NODE, &vtysh_quit_all_cmd);
install_element (CONFIG_NODE, &vtysh_exit_all_cmd);
/* install_element (CONFIG_NODE, &vtysh_quit_all_cmd); */
install_element (ENABLE_NODE, &vtysh_exit_all_cmd);
install_element (ENABLE_NODE, &vtysh_quit_all_cmd);
install_element (RIP_NODE, &vtysh_exit_ripd_cmd);
install_element (RIP_NODE, &vtysh_quit_ripd_cmd);
install_element (RIPNG_NODE, &vtysh_exit_ripngd_cmd);
@ -3419,11 +3416,8 @@ vtysh_init_vty (void)
install_element (ENABLE_NODE, &vtysh_write_memory_cmd);
install_element (VIEW_NODE, &vtysh_terminal_length_cmd);
install_element (ENABLE_NODE, &vtysh_terminal_length_cmd);
install_element (VIEW_NODE, &vtysh_terminal_no_length_cmd);
install_element (ENABLE_NODE, &vtysh_terminal_no_length_cmd);
install_element (VIEW_NODE, &vtysh_show_daemons_cmd);
install_element (ENABLE_NODE, &vtysh_show_daemons_cmd);
install_element (VIEW_NODE, &vtysh_ping_cmd);
install_element (VIEW_NODE, &vtysh_ping_ip_cmd);
@ -3437,37 +3431,21 @@ vtysh_init_vty (void)
install_element (VIEW_NODE, &vtysh_telnet_cmd);
install_element (VIEW_NODE, &vtysh_telnet_port_cmd);
install_element (VIEW_NODE, &vtysh_ssh_cmd);
#endif
install_element (ENABLE_NODE, &vtysh_ping_cmd);
install_element (ENABLE_NODE, &vtysh_ping_ip_cmd);
install_element (ENABLE_NODE, &vtysh_traceroute_cmd);
install_element (ENABLE_NODE, &vtysh_traceroute_ip_cmd);
#ifdef HAVE_IPV6
install_element (ENABLE_NODE, &vtysh_ping6_cmd);
install_element (ENABLE_NODE, &vtysh_traceroute6_cmd);
#endif
#if defined(HAVE_SHELL_ACCESS)
install_element (ENABLE_NODE, &vtysh_telnet_cmd);
install_element (ENABLE_NODE, &vtysh_telnet_port_cmd);
install_element (ENABLE_NODE, &vtysh_ssh_cmd);
install_element (ENABLE_NODE, &vtysh_start_shell_cmd);
install_element (ENABLE_NODE, &vtysh_start_bash_cmd);
install_element (ENABLE_NODE, &vtysh_start_zsh_cmd);
#endif
install_element (VIEW_NODE, &vtysh_show_memory_cmd);
install_element (ENABLE_NODE, &vtysh_show_memory_cmd);
install_element (VIEW_NODE, &vtysh_show_work_queues_cmd);
install_element (ENABLE_NODE, &vtysh_show_work_queues_cmd);
install_element (ENABLE_NODE, &vtysh_show_work_queues_daemon_cmd);
install_element (VIEW_NODE, &vtysh_show_work_queues_daemon_cmd);
install_element (VIEW_NODE, &vtysh_show_thread_cmd);
install_element (ENABLE_NODE, &vtysh_show_thread_cmd);
/* Logging */
install_element (ENABLE_NODE, &vtysh_show_logging_cmd);
install_element (VIEW_NODE, &vtysh_show_logging_cmd);
install_element (CONFIG_NODE, &vtysh_log_stdout_cmd);
install_element (CONFIG_NODE, &vtysh_log_stdout_level_cmd);