aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/vlib/cli.c40
-rw-r--r--src/vlib/cli.h1
-rw-r--r--src/vnet/session/session_cli.c65
3 files changed, 27 insertions, 79 deletions
diff --git a/src/vlib/cli.c b/src/vlib/cli.c
index 80da2d59992..c43371e0d9f 100644
--- a/src/vlib/cli.c
+++ b/src/vlib/cli.c
@@ -159,46 +159,6 @@ done:
return match;
}
-/* Get current command args */
-uword
-unformat_vlib_cli_args (unformat_input_t *i, va_list *va)
-{
- unformat_input_t *result = va_arg (*va, unformat_input_t *);
- u8 *line;
- uword last_c;
- u32 index = i->index;
-
- if (unformat_is_eof (i))
- {
- unformat_init (result, 0, 0);
- return 0;
- }
-
- /* try to find last non-space character */
- do
- {
- ASSERT (index > 0);
- last_c = i->buffer[--index];
- }
- while (last_c == ' ');
-
- if (last_c == '\t' || last_c == '\n' || last_c == '\r' || last_c == '\f' ||
- last_c == '}')
- {
- /* current command has no args */
- unformat_init (result, 0, 0);
- return 0;
- }
-
- if (!unformat_user (i, unformat_line, &line))
- {
- unformat_init (result, 0, 0);
- return 0;
- }
- unformat_init_vector (result, line);
- return 1;
-}
-
uword
unformat_vlib_cli_line (unformat_input_t *i, va_list *va)
{
diff --git a/src/vlib/cli.h b/src/vlib/cli.h
index 86913e9708c..a2f9c24d2ec 100644
--- a/src/vlib/cli.h
+++ b/src/vlib/cli.h
@@ -204,7 +204,6 @@ clib_error_t *vlib_cli_register (struct vlib_main_t *vm,
clib_error_t *vlib_cli_register_parse_rule (struct vlib_main_t *vm,
vlib_cli_parse_rule_t * c);
-uword unformat_vlib_cli_args (unformat_input_t *i, va_list *va);
unformat_function_t unformat_vlib_cli_line;
uword unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args);
diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
index fabff11243b..da2df331b44 100644
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -487,7 +487,6 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
{
u8 one_session = 0, do_listeners = 0, sst, do_elog = 0, do_filter = 0;
u32 track_index, thread_index = 0, start = 0, end = ~0, session_index;
- unformat_input_t _cli_args, *cli_args = &_cli_args;
transport_proto_t transport_proto = TRANSPORT_PROTO_INVALID;
session_state_t state = SESSION_N_STATES, *states = 0;
session_main_t *smm = &session_main;
@@ -501,26 +500,20 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
session_cli_return_if_not_enabled ();
- if (!unformat_user (input, unformat_vlib_cli_args, cli_args))
- {
- session_cli_show_all_sessions (vm, 0);
- return 0;
- }
-
- while (unformat_check_input (cli_args) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (cli_args, "verbose %d", &verbose))
+ if (unformat (input, "verbose %d", &verbose))
;
- else if (unformat (cli_args, "verbose"))
+ else if (unformat (input, "verbose"))
verbose = 1;
- else if (unformat (cli_args, "listeners %U", unformat_transport_proto,
+ else if (unformat (input, "listeners %U", unformat_transport_proto,
&transport_proto))
do_listeners = 1;
- else if (unformat (cli_args, "%U", unformat_session, &s))
+ else if (unformat (input, "%U", unformat_session, &s))
{
one_session = 1;
}
- else if (unformat (cli_args, "thread %u index %u", &thread_index,
+ else if (unformat (input, "thread %u index %u", &thread_index,
&session_index))
{
s = session_get_if_valid (session_index, thread_index);
@@ -531,18 +524,17 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
}
one_session = 1;
}
- else if (unformat (cli_args, "thread %u", &thread_index))
+ else if (unformat (input, "thread %u", &thread_index))
{
do_filter = 1;
}
- else if (unformat (cli_args, "state %U", unformat_session_state, &state))
+ else if (unformat (input, "state %U", unformat_session_state, &state))
{
vec_add1 (states, state);
do_filter = 1;
}
- else if (unformat (cli_args, "proto %U index %u",
- unformat_transport_proto, &transport_proto,
- &transport_index))
+ else if (unformat (input, "proto %U index %u", unformat_transport_proto,
+ &transport_proto, &transport_index))
{
transport_connection_t *tc;
tc = transport_get_connection (transport_proto, transport_index,
@@ -563,34 +555,34 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
}
one_session = 1;
}
- else if (unformat (cli_args, "proto %U", unformat_transport_proto,
+ else if (unformat (input, "proto %U", unformat_transport_proto,
&transport_proto))
do_filter = 1;
- else if (unformat (cli_args, "range %u %u", &start, &end))
+ else if (unformat (input, "range %u %u", &start, &end))
do_filter = 1;
- else if (unformat (cli_args, "range %u", &start))
+ else if (unformat (input, "range %u", &start))
{
end = start + 50;
do_filter = 1;
}
- else if (unformat (cli_args, "elog"))
+ else if (unformat (input, "elog"))
do_elog = 1;
- else if (unformat (cli_args, "protos"))
+ else if (unformat (input, "protos"))
{
vlib_cli_output (vm, "%U", format_transport_protos);
goto done;
}
- else if (unformat (cli_args, "states"))
+ else if (unformat (input, "states"))
{
session_cli_print_session_states (vm);
goto done;
}
- else if (unformat (cli_args, "events"))
+ else if (unformat (input, "events"))
do_events = 1;
else
{
error = clib_error_return (0, "unknown input `%U'",
- format_unformat_error, cli_args);
+ format_unformat_error, input);
goto done;
}
}
@@ -659,7 +651,6 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
session_cli_show_all_sessions (vm, verbose);
done:
- unformat_free (cli_args);
vec_free (states);
return error;
}
@@ -849,29 +840,27 @@ static clib_error_t *
session_enable_disable_fn (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
{
- unformat_input_t _cli_args, *cli_args = &_cli_args;
- u8 is_en = 1;
+ u8 is_en = 2;
clib_error_t *error;
- if (!unformat_user (input, unformat_vlib_cli_args, cli_args))
- return clib_error_return (0, "expected enable | disable");
-
- while (unformat_check_input (cli_args) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (cli_args, "enable"))
+ if (unformat (input, "enable"))
is_en = 1;
- else if (unformat (cli_args, "disable"))
+ else if (unformat (input, "disable"))
is_en = 0;
else
{
error = clib_error_return (0, "unknown input `%U'",
- format_unformat_error, cli_args);
- unformat_free (cli_args);
+ format_unformat_error, input);
+ unformat_free (input);
return error;
}
}
- unformat_free (cli_args);
+ if (is_en > 1)
+ return clib_error_return (0, "expected enable | disable");
+
return vnet_session_enable_disable (vm, is_en);
}