ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlib: restore commands for non-interactive sessions

Browse Source 
'quit' and 'show terminal' are valid for non-interactive sessions too.

Type: fix
Fixes: a58be82dda89d6496f92e451b42eee31f0cf47b4

Change-Id: Ib63244c7b64ad2e30c257ed19e982295f59bfffa
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 10a22a629468b18f5b07316980e2761285283939)
This commit is contained in:
Benoît Ganne
2020-05-15 16:12:23 +02:00
committed by Andrew Yourtchenko
parent b1a7f68b22
commit 449f50555d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/vlib/unix/cli.c
View File

@ -3232,14 +3232,19 @@ vlib_unix_cli_set_prompt (char *prompt)
cm->cli_prompt = format (0, fmt, prompt);
}
static unix_cli_file_t *
unix_cli_file_if_exists (unix_cli_main_t * cm)
{
if (!cm->cli_file_pool)
return 0;
return pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
}
static unix_cli_file_t *
unix_cli_file_if_interactive (unix_cli_main_t * cm)
{
unix_cli_file_t *cf;
if (!cm->cli_file_pool)
return 0;
cf = pool_elt_at_index (cm->cli_file_pool, cm->current_input_file_index);
if (!cf->is_interactive)
if ((cf = unix_cli_file_if_exists (cm)) && !cf->is_interactive)
return 0;
return cf;
}
@ -3255,8 +3260,8 @@ unix_cli_quit (vlib_main_t * vm,
unix_cli_main_t *cm = &unix_cli_main;
unix_cli_file_t *cf;
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
if (!(cf = unix_cli_file_if_exists (cm)))
return clib_error_return (0, "invalid session");
/* Cosmetic: suppress the final prompt from appearing before we die */
cf->is_interactive = 0;
@ -3546,8 +3551,8 @@ unix_cli_show_terminal (vlib_main_t * vm,
unix_cli_file_t *cf;
vlib_node_t *n;
if (!(cf = unix_cli_file_if_interactive (cm)))
return clib_error_return (0, "invalid for non-interactive sessions");
if (!(cf = unix_cli_file_if_exists (cm)))
return clib_error_return (0, "invalid session");
n = vlib_get_node (vm, cf->process_node_index);