'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>
}
static unix_cli_file_t *
}
static unix_cli_file_t *
-unix_cli_file_if_interactive (unix_cli_main_t * cm)
+unix_cli_file_if_exists (unix_cli_main_t * cm)
if (!cm->cli_file_pool)
return 0;
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)
+ 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 ((cf = unix_cli_file_if_exists (cm)) && !cf->is_interactive)
unix_cli_main_t *cm = &unix_cli_main;
unix_cli_file_t *cf;
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;
/* Cosmetic: suppress the final prompt from appearing before we die */
cf->is_interactive = 0;
unix_cli_file_t *cf;
vlib_node_t *n;
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);
n = vlib_get_node (vm, cf->process_node_index);