session: segment manager improvements

[vpp.git] / src / vnet / session / session_cli.c

diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
index 4d43297..028dc9d 100755 (executable)
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -57,14 +57,15 @@ format_stream_session (u8 * s, va_list * args)
   u8 *str = 0;
   tp_vft = session_get_transport_vft (ss->session_type);
 
-  if (verbose == 1)
+  if (verbose == 1 && ss->session_state >= SESSION_STATE_ACCEPTING)
     str = format (0, "%-10u%-10u%-10lld",
                  svm_fifo_max_dequeue (ss->server_rx_fifo),
                  svm_fifo_max_enqueue (ss->server_tx_fifo),
                  stream_session_get_index (ss));
 
   if (ss->session_state == SESSION_STATE_READY
-      || ss->session_state == SESSION_STATE_ACCEPTING)
+      || ss->session_state == SESSION_STATE_ACCEPTING
+      || ss->session_state == SESSION_STATE_CLOSED)
     {
       s = format (s, "%U", tp_vft->format_connection, ss->connection_index,
                  ss->thread_index, verbose);
@@ -83,16 +84,6 @@ format_stream_session (u8 * s, va_list * args)
       s = format (s, "%-40U%v", tp_vft->format_half_open,
                  ss->connection_index, str);
     }
-  else if (ss->session_state == SESSION_STATE_CLOSED)
-    {
-      s =
-       format (s, "[CL] %U", tp_vft->format_connection, 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);
-    }
   else
     {
       clib_warning ("Session in state: %d!", ss->session_state);
@@ -284,9 +275,9 @@ 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%-10s",
+                               "Connection", "State", "Rx-f", "Tx-f",
+                               "S-idx");
                  vlib_cli_output (vm, "%v", str);
                  vec_reset_length (str);
                  once_per_pool = 0;
@@ -312,10 +303,10 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
 }
 
 /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_session_command, static) =
+VLIB_CLI_COMMAND (vlib_cli_show_session_command) =
 {
   .path = "show session",
-  .short_help = "show session [verbose]",
+  .short_help = "show session [verbose [nnn]]",
   .function = show_session_command_fn,
 };
 /* *INDENT-ON* */