X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_cli.c;h=6ca090a850833690c76be6a329abb84e4d3dd3c1;hb=de9a849a18514f0b09bb5f57a73f6a57ee425c76;hp=588cb603d39ca746a9ccbbb5ee2a5701d404a25c;hpb=cea194d8f973a2f2b5ef72d212533057174cc70a;p=vpp.git diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c index 588cb603d39..6ca090a8508 100755 --- a/src/vnet/session/session_cli.c +++ b/src/vnet/session/session_cli.c @@ -16,21 +16,26 @@ #include u8 * -format_stream_session_fifos (u8 * s, va_list * args) +format_session_fifos (u8 * s, va_list * args) { stream_session_t *ss = va_arg (*args, stream_session_t *); int verbose = va_arg (*args, int); - session_fifo_event_t _e, *e = &_e; + session_event_t _e, *e = &_e; u8 found; - s = format (s, " Rx fifo: %U", format_svm_fifo, ss->server_rx_fifo, 1); + if (!ss->server_rx_fifo || !ss->server_tx_fifo) + return s; + + s = format (s, " Rx fifo: %U", format_svm_fifo, ss->server_rx_fifo, + verbose); if (verbose > 2 && ss->server_rx_fifo->has_event) { found = session_node_lookup_fifo_event (ss->server_rx_fifo, e); s = format (s, " session node event: %s\n", found ? "found" : "not found"); } - s = format (s, " Tx fifo: %U", format_svm_fifo, ss->server_tx_fifo, 1); + s = format (s, " Tx fifo: %U", format_svm_fifo, ss->server_tx_fifo, + verbose); if (verbose > 2 && ss->server_tx_fifo->has_event) { found = session_node_lookup_fifo_event (ss->server_tx_fifo, e); @@ -53,36 +58,34 @@ format_stream_session (u8 * s, va_list * args) { stream_session_t *ss = va_arg (*args, stream_session_t *); int verbose = va_arg (*args, int); - transport_proto_vft_t *tp_vft; + u32 tp = session_get_transport_proto (ss); u8 *str = 0; - tp_vft = session_get_transport_vft (ss->session_type); if (verbose == 1 && ss->session_state >= SESSION_STATE_ACCEPTING) - str = format (0, "%-10u%-10u%-10lld", + str = format (0, "%-10u%-10u", svm_fifo_max_dequeue (ss->server_rx_fifo), - svm_fifo_max_enqueue (ss->server_tx_fifo), - stream_session_get_index (ss)); + svm_fifo_max_dequeue (ss->server_tx_fifo)); - if (ss->session_state == SESSION_STATE_READY - || ss->session_state == SESSION_STATE_ACCEPTING - || ss->session_state == SESSION_STATE_CLOSED) + if (ss->session_state >= SESSION_STATE_ACCEPTING) { - s = format (s, "%U", tp_vft->format_connection, ss->connection_index, - ss->thread_index, verbose); + s = format (s, "%U", format_transport_connection, tp, + ss->connection_index, ss->thread_index, verbose); if (verbose == 1) s = format (s, "%v", str); if (verbose > 1) - s = format (s, "%U", format_stream_session_fifos, ss, verbose); + s = format (s, "%U", format_session_fifos, ss, verbose); } else if (ss->session_state == SESSION_STATE_LISTENING) { - s = format (s, "%-40U%v", tp_vft->format_listener, ss->connection_index, - str); + s = format (s, "%-40U%v", format_transport_listen_connection, + tp, ss->connection_index, str); + if (verbose > 1) + s = format (s, "\n%U", format_session_fifos, ss, verbose); } else if (ss->session_state == SESSION_STATE_CONNECTING) { - s = format (s, "%-40U%v", tp_vft->format_half_open, - ss->connection_index, str); + s = format (s, "%-40U%v", format_transport_half_open_connection, + tp, ss->connection_index, str); } else { @@ -104,8 +107,8 @@ unformat_stream_session_id (unformat_input_t * input, va_list * args) u8 *is_ip4 = va_arg (*args, u8 *); u8 tuple_is_set = 0; - memset (lcl, 0, sizeof (*lcl)); - memset (rmt, 0, sizeof (*rmt)); + clib_memset (lcl, 0, sizeof (*lcl)); + clib_memset (rmt, 0, sizeof (*rmt)); if (unformat (input, "tcp")) { @@ -146,16 +149,17 @@ unformat_stream_session (unformat_input_t * input, va_list * args) return 0; if (is_ip4) - s = session_lookup4 (fib_index, &lcl.ip4, &rmt.ip4, - clib_host_to_net_u16 (lcl_port), - clib_host_to_net_u16 (rmt_port), proto); + s = session_lookup_safe4 (fib_index, &lcl.ip4, &rmt.ip4, + clib_host_to_net_u16 (lcl_port), + clib_host_to_net_u16 (rmt_port), proto); else - s = session_lookup6 (fib_index, &lcl.ip6, &rmt.ip6, - clib_host_to_net_u16 (lcl_port), - clib_host_to_net_u16 (rmt_port), proto); + s = session_lookup_safe6 (fib_index, &lcl.ip6, &rmt.ip6, + clib_host_to_net_u16 (lcl_port), + clib_host_to_net_u16 (rmt_port), proto); if (s) { *result = s; + session_pool_remove_peeker (s->thread_index); return 1; } return 0; @@ -201,10 +205,10 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { session_manager_main_t *smm = &session_manager_main; + u8 *str = 0, one_session = 0, do_listeners = 0, sst, *app_name; int verbose = 0, i; - stream_session_t *pool; - stream_session_t *s; - u8 *str = 0, one_session = 0; + stream_session_t *pool, *s; + u32 transport_proto = ~0; if (!smm->is_enabled) { @@ -217,6 +221,9 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, ; else if (unformat (input, "verbose")) verbose = 1; + else if (unformat (input, "listeners %U", unformat_transport_proto, + &transport_proto)) + do_listeners = 1; else if (unformat (input, "%U", unformat_stream_session, &s)) { one_session = 1; @@ -232,6 +239,24 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, return 0; } + if (do_listeners) + { + sst = session_type_from_proto_and_ip (transport_proto, 1); + vlib_cli_output (vm, "%-40s%-24s", "Listener", "App"); + /* *INDENT-OFF* */ + pool_foreach (s, smm->sessions[0], ({ + if (s->session_state != SESSION_STATE_LISTENING + || s->session_type != sst) + continue; + app_name = application_name_from_index (s->app_wrk_index); + vlib_cli_output (vm, "%U%-25v%", format_stream_session, s, 1, + app_name); + vec_free (app_name); + })); + /* *INDENT-ON* */ + return 0; + } + for (i = 0; i < vec_len (smm->sessions); i++) { u32 once_per_pool; @@ -248,9 +273,8 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, { if (once_per_pool && verbose == 1) { - str = format (str, "%-50s%-15s%-10s%-10s%-10s", - "Connection", "State", "Rx-f", "Tx-f", - "S-idx"); + str = format (str, "%-50s%-15s%-10s%-10s", + "Connection", "State", "Rx-f", "Tx-f"); vlib_cli_output (vm, "%v", str); vec_reset_length (str); once_per_pool = 0; @@ -287,7 +311,8 @@ VLIB_CLI_COMMAND (vlib_cli_show_session_command) = static int clear_session (stream_session_t * s) { - application_t *server = application_get (s->app_index); + app_worker_t *server_wrk = app_worker_get (s->app_wrk_index); + application_t *server = application_get (server_wrk->app_index); server->cb_fns.session_disconnect_callback (s); return 0; } @@ -324,7 +349,7 @@ clear_session_command_fn (vlib_main_t * vm, unformat_input_t * input, if (session_index != ~0) { - session = stream_session_get_if_valid (session_index, thread_index); + session = session_get_if_valid (session_index, thread_index); if (!session) return clib_error_return (0, "no session %d on thread %d", session_index, thread_index); @@ -456,19 +481,29 @@ static clib_error_t * session_enable_disable_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { + unformat_input_t _line_input, *line_input = &_line_input; u8 is_en = 1; + clib_error_t *error; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (!unformat_user (input, unformat_line_input, line_input)) + return clib_error_return (0, "expected enable | disable"); + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) + if (unformat (line_input, "enable")) is_en = 1; - else if (unformat (input, "disable")) + else if (unformat (line_input, "disable")) is_en = 0; else - return clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); + { + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + unformat_free (line_input); + return error; + } } + unformat_free (line_input); return vnet_session_enable_disable (vm, is_en); }