proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 22:10:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, zebra: fix exit commands

Browse Source 
If a command is not marked as `YANG`-converted, the current command
batching buffer is flushed before executing the command. We shouldn't
flush the buffer when executing an `exit` command. It should only be
flushed if the next command is not `YANG`-converted, which is checked by
the command itself, not the previous `exit`.

Fixes #15706.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit 57811a53ba)
This commit is contained in:
Igor Ryzhov 2024-04-16 22:10:45 +03:00 committed by Mergify
parent a4cea5cf15
commit 13bb2b2125
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/command.c
View File

@ -1356,7 +1356,7 @@ DEFUN (disable,
} }
/* Down vty node level. */ /* Down vty node level. */
DEFUN (config_exit, DEFUN_YANG (config_exit,
config_exit_cmd, config_exit_cmd,
"exit", "exit",
"Exit current mode and down to previous mode\n") "Exit current mode and down to previous mode\n")

2
lib/vrf.c
View File

@ -636,7 +636,7 @@ int vrf_configure_backend(enum vrf_backend_type backend)
} }
/* vrf CLI commands */ /* vrf CLI commands */
DEFUN_NOSH(vrf_exit, DEFUN_YANG_NOSH (vrf_exit,
vrf_exit_cmd, vrf_exit_cmd,
"exit-vrf", "exit-vrf",
"Exit current mode and down to previous mode\n") "Exit current mode and down to previous mode\n")

2
zebra/zebra_cli.c
View File

@ -241,7 +241,7 @@ DEFUN_YANG_NOSH (link_params,
return ret; return ret;
} }
DEFUN_NOSH (exit_link_params, DEFUN_YANG_NOSH (exit_link_params,
exit_link_params_cmd, exit_link_params_cmd,
"exit-link-params", "exit-link-params",
"Exit from Link Params configuration mode\n") "Exit from Link Params configuration mode\n")