From 460982cf42c77170ba103a10dff8807df73982c8 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Mon, 28 Sep 2020 17:13:40 +0300 Subject: [PATCH 1/2] vtysh: fix exit from babeld node Signed-off-by: Igor Ryzhov --- vtysh/vtysh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 4edbb7a889..cf60ab99b2 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2197,7 +2197,7 @@ DEFUNSH(VTYSH_EIGRPD, vtysh_quit_eigrpd, vtysh_quit_eigrpd_cmd, "quit", return vtysh_exit(vty); } -DEFUNSH(VTYSH_EIGRPD, vtysh_exit_babeld, vtysh_exit_babeld_cmd, "exit", +DEFUNSH(VTYSH_BABELD, vtysh_exit_babeld, vtysh_exit_babeld_cmd, "exit", "Exit current mode and down to previous mode\n") { return vtysh_exit(vty); From 949467e2c1dc33974dde5a08cbd3331cb7865107 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Mon, 28 Sep 2020 17:17:05 +0300 Subject: [PATCH 2/2] vtysh: fix exit from keychain node Signed-off-by: Igor Ryzhov --- vtysh/vtysh.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index cf60ab99b2..bb158f3c9e 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2267,6 +2267,18 @@ DEFUNSH(VTYSH_FABRICD, vtysh_quit_fabricd, vtysh_quit_fabricd_cmd, "quit", return vtysh_exit_fabricd(self, vty, argc, argv); } +DEFUNSH(VTYSH_KEYS, vtysh_exit_keys, vtysh_exit_keys_cmd, "exit", + "Exit current mode and down to previous mode\n") +{ + return vtysh_exit(vty); +} + +DEFUNSH(VTYSH_KEYS, vtysh_quit_keys, vtysh_quit_keys_cmd, "quit", + "Exit current mode and down to previous mode\n") +{ + return vtysh_exit_keys(self, vty, argc, argv); +} + DEFUNSH(VTYSH_ALL, vtysh_exit_line_vty, vtysh_exit_line_vty_cmd, "exit", "Exit current mode and down to previous mode\n") { @@ -3910,10 +3922,10 @@ void vtysh_init_vty(void) install_element(ISIS_NODE, &vtysh_quit_isisd_cmd); install_element(OPENFABRIC_NODE, &vtysh_exit_fabricd_cmd); install_element(OPENFABRIC_NODE, &vtysh_quit_fabricd_cmd); - install_element(KEYCHAIN_NODE, &vtysh_exit_ripd_cmd); - install_element(KEYCHAIN_NODE, &vtysh_quit_ripd_cmd); - install_element(KEYCHAIN_KEY_NODE, &vtysh_exit_ripd_cmd); - install_element(KEYCHAIN_KEY_NODE, &vtysh_quit_ripd_cmd); + install_element(KEYCHAIN_NODE, &vtysh_exit_keys_cmd); + install_element(KEYCHAIN_NODE, &vtysh_quit_keys_cmd); + install_element(KEYCHAIN_KEY_NODE, &vtysh_exit_keys_cmd); + install_element(KEYCHAIN_KEY_NODE, &vtysh_quit_keys_cmd); install_element(RMAP_NODE, &vtysh_exit_rmap_cmd); install_element(RMAP_NODE, &vtysh_quit_rmap_cmd); install_element(PBRMAP_NODE, &vtysh_exit_pbr_map_cmd);