ipsec: Fix NULL encryption algorithm

[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 5179322..fd598f4 100755 (executable)
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -59,7 +59,7 @@ format_session (u8 * s, va_list * args)
   u32 tp = session_get_transport_proto (ss);
   u8 *str = 0;
 
-  if (ss->session_state >= SESSION_STATE_TRANSPORT_CLOSED)
+  if (ss->session_state >= SESSION_STATE_TRANSPORT_DELETED)
     {
       s = format (s, "[%u:%u] CLOSED", ss->thread_index, ss->session_index);
       return s;
@@ -68,7 +68,8 @@ format_session (u8 * s, va_list * args)
   if (verbose == 1)
     {
       u8 post_accept = ss->session_state >= SESSION_STATE_ACCEPTING;
-      u8 hasf = post_accept | session_tx_is_dgram (ss);
+      u8 hasf = post_accept
+       || session_transport_service_type (ss) == TRANSPORT_SERVICE_CL;
       u32 rxf, txf;
 
       rxf = hasf ? svm_fifo_max_dequeue (ss->rx_fifo) : 0;
@@ -76,7 +77,8 @@ format_session (u8 * s, va_list * args)
       str = format (0, "%-10u%-10u", rxf, txf);
     }
 
-  if (ss->session_state >= SESSION_STATE_ACCEPTING)
+  if (ss->session_state >= SESSION_STATE_ACCEPTING
+      || ss->session_state == SESSION_STATE_CREATED)
     {
       s = format (s, "%U", format_transport_connection, tp,
                  ss->connection_index, ss->thread_index, verbose);
@@ -88,14 +90,14 @@ format_session (u8 * s, va_list * args)
   else if (ss->session_state == SESSION_STATE_LISTENING)
     {
       s = format (s, "%U%v", format_transport_listen_connection,
-                 tp, ss->connection_index, verbose, str);
+                 tp, ss->connection_index, ss->thread_index, verbose, 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", format_transport_half_open_connection,
-                 tp, ss->connection_index, str);
+                 tp, ss->connection_index, ss->thread_index, str);
     }
   else
     {
@@ -328,7 +330,7 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
       /* *INDENT-OFF* */
       pool_foreach (s, pool, ({
-        if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSED)
+        if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED)
           {
             n_closed += 1;
             continue;