From: Aloys Augustin <aloaugus@cisco.com>
Date: Wed, 1 Apr 2020 17:50:17 +0000 (+0200)
Subject: session: fix fifos display
X-Git-Tag: v20.09-rc0~304
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F26288%2F1;p=vpp.git

session: fix fifos display

This prevents a crash with quic listeners, and enables the display
of udp fifo status.

Change-Id: Ib9f48818ee3e51a3fa43ad8ab175e8aa7750df8f
Type: fix
Signed-off-by: Aloys Augustin <aloaugus@cisco.com>
---

diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
index 682249ae60f..9f6d74c031d 100644
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -113,13 +113,10 @@ format_session (u8 * s, va_list * args)
 
   if (verbose == 1)
     {
-      u8 post_accept = ss->session_state >= SESSION_STATE_ACCEPTING;
-      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;
-      txf = hasf ? svm_fifo_max_dequeue (ss->tx_fifo) : 0;
+      rxf = ss->rx_fifo ? svm_fifo_max_dequeue (ss->rx_fifo) : 0;
+      txf = ss->tx_fifo ? svm_fifo_max_dequeue (ss->tx_fifo) : 0;
       str = format (0, "%-10u%-10u", rxf, txf);
     }