proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 15:33:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh: fix searching commands in parent nodes

Browse Source 
Do not check parent command nodes in case of ambiguous and incomplete commands

Signed-off-by: Pavel Ivashchenko <pivashchenko@nfware.com>
This commit is contained in:
Pavel Ivashchenko 2019-09-30 15:57:10 +00:00 committed by Igor Ryzhov
parent d8c3daca19
commit 4bb7f7c2dd
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/command.c
View File

@ -1049,6 +1049,7 @@ int cmd_execute_command(vector vline, struct vty *vty,
return saved_ret; return saved_ret;
if (ret != CMD_SUCCESS && ret != CMD_WARNING if (ret != CMD_SUCCESS && ret != CMD_WARNING
&& ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE
&& ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED) { && ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED) {
/* This assumes all nodes above CONFIG_NODE are childs of /* This assumes all nodes above CONFIG_NODE are childs of
* CONFIG_NODE */ * CONFIG_NODE */
@ -1062,6 +1063,7 @@ int cmd_execute_command(vector vline, struct vty *vty,
ret = cmd_execute_command_real(vline, FILTER_RELAXED, ret = cmd_execute_command_real(vline, FILTER_RELAXED,
vty, cmd, 0); vty, cmd, 0);
if (ret == CMD_SUCCESS || ret == CMD_WARNING if (ret == CMD_SUCCESS || ret == CMD_WARNING
|| ret == CMD_ERR_AMBIGUOUS || ret == CMD_ERR_INCOMPLETE
|| ret == CMD_NOT_MY_INSTANCE || ret == CMD_NOT_MY_INSTANCE
|| ret == CMD_WARNING_CONFIG_FAILED) || ret == CMD_WARNING_CONFIG_FAILED)
return ret; return ret;
@ -1260,6 +1262,7 @@ int command_config_read_one_line(struct vty *vty,
while (!(use_daemon && ret == CMD_SUCCESS_DAEMON) while (!(use_daemon && ret == CMD_SUCCESS_DAEMON)
&& !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) && !(!use_daemon && ret == CMD_ERR_NOTHING_TODO)
&& ret != CMD_SUCCESS && ret != CMD_WARNING && ret != CMD_SUCCESS && ret != CMD_WARNING
&& ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE
&& ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED && ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED
&& ret != CMD_NO_LEVEL_UP) && ret != CMD_NO_LEVEL_UP)
ret = cmd_execute_command_real(vline, FILTER_STRICT, vty, cmd, ret = cmd_execute_command_real(vline, FILTER_STRICT, vty, cmd,

2
vtysh/vtysh.c
View File

@ -493,6 +493,7 @@ static int vtysh_execute_func(const char *line, int pager)
*/ */
while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON
&& ret != CMD_WARNING && ret != CMD_WARNING_CONFIG_FAILED && ret != CMD_WARNING && ret != CMD_WARNING_CONFIG_FAILED
&& ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE
&& vty->node > CONFIG_NODE) { && vty->node > CONFIG_NODE) {
vty->node = node_parent(vty->node); vty->node = node_parent(vty->node);
ret = cmd_execute(vty, line, &cmd, 1); ret = cmd_execute(vty, line, &cmd, 1);
@ -794,6 +795,7 @@ int vtysh_mark_file(const char *filename)
*/ */
while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON
&& ret != CMD_WARNING && ret != CMD_WARNING_CONFIG_FAILED && ret != CMD_WARNING && ret != CMD_WARNING_CONFIG_FAILED
&& ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE
&& vty->node > CONFIG_NODE) { && vty->node > CONFIG_NODE) {
vty->node = node_parent(vty->node); vty->node = node_parent(vty->node);
ret = cmd_execute_command_strict(vline, vty, &cmd); ret = cmd_execute_command_strict(vline, vty, &cmd);