Implement sack based tcp loss recovery (RFC 6675)

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

diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
old mode 100644 (file)
new mode 100755 (executable)
index b029ee6..6b8341a
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -15,6 +15,15 @@
 #include <vnet/session/application.h>
 #include <vnet/session/session.h>
 
+u8 *
+format_stream_session_fifos (u8 * s, va_list * args)
+{
+  stream_session_t *ss = va_arg (*args, stream_session_t *);
+  s = format (s, " Rx fifo: %U", format_svm_fifo, ss->server_rx_fifo, 1);
+  s = format (s, " Tx fifo: %U", format_svm_fifo, ss->server_tx_fifo, 1);
+  return s;
+}
+
 /**
  * Format stream session as per the following format
  *
@@ -30,33 +39,41 @@ format_stream_session (u8 * s, va_list * args)
   int verbose = va_arg (*args, int);
   transport_proto_vft_t *tp_vft;
   u8 *str = 0;
-
   tp_vft = session_get_transport_vft (ss->session_type);
 
-  if (verbose)
-    str = format (0, "%-20llp%-20llp%-15lld", ss->server_rx_fifo,
-                 ss->server_tx_fifo, stream_session_get_index (ss));
+  if (verbose == 1)
+    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)
     {
-      s = format (s, "%-40U%v", tp_vft->format_connection,
-                 ss->connection_index, ss->thread_index, str);
+      s = format (s, "%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);
     }
   else if (ss->session_state == SESSION_STATE_LISTENING)
     {
       s = format (s, "%-40U%v", tp_vft->format_listener, ss->connection_index,
                  str);
     }
-  else if (ss->session_state == SESSION_STATE_READY)
+  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", tp_vft->format_half_open,
+                 ss->connection_index, str);
     }
   else if (ss->session_state == SESSION_STATE_CLOSED)
     {
-      s = format (s, "[CL] %-40U%v", tp_vft->format_connection,
-                 ss->connection_index, ss->thread_index, str);
+      s = format (s, "[CL] %-40U", 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);
     }
   else
     {
@@ -80,12 +97,14 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
   if (!smm->is_enabled)
     {
-      clib_error_return (0, "session layer is not enabled");
+      return clib_error_return (0, "session layer is not enabled");
     }
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (input, "verbose"))
+      if (unformat (input, "verbose %d", &verbose))
+       ;
+      else if (unformat (input, "verbose"))
        verbose = 1;
       else
        break;
@@ -105,11 +124,11 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
                           i, pool_elts (pool));
          if (verbose)
            {
-             if (once_per_pool)
+             if (once_per_pool && verbose == 1)
                {
-                 str = format (str, "%-40s%-20s%-20s%-15s",
-                               "Connection", "Rx fifo", "Tx fifo",
-                               "Session Index");
+                 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;
@@ -118,7 +137,9 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
               /* *INDENT-OFF* */
               pool_foreach (s, pool,
               ({
-                vlib_cli_output (vm, "%U", format_stream_session, s, verbose);
+               vec_reset_length (str);
+                str = format (str, "%U", format_stream_session, s, verbose);
+                vlib_cli_output (vm, "%v", str);
               }));
               /* *INDENT-ON* */
            }
@@ -152,7 +173,7 @@ clear_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
   if (!smm->is_enabled)
     {
-      clib_error_return (0, "session layer is not enabled");
+      return clib_error_return (0, "session layer is not enabled");
     }
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)