summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorAloys Augustin <aloaugus@cisco.com>2019-07-12 17:11:04 +0200
committerFlorin Coras <florin.coras@gmail.com>2019-07-12 17:55:31 +0000
commit95dd1fe279111f9accdeeecc0accff016f7e15fc (patch)
tree3b1e0442a15e78cd4b4a48388dcd769e9748d4d4 /src/vnet
parentbec771b879c2eae31ecef61891405c1570aae2b1 (diff)
quic: fix show session verbose
Proprely display quic connections in show session verbose, and add a small fix for UDPC listeners and UDP sessions formatting. Change-Id: I33f83e77bf357347623d87ad23c483aba60a9bb2 Signed-off-by: Aloys Augustin <aloaugus@cisco.com> Type: feature
Diffstat (limited to 'src/vnet')
-rwxr-xr-xsrc/vnet/session/session_cli.c3
-rw-r--r--src/vnet/udp/udp.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
index d839532eea3..ca4b8c12f8d 100755
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -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;
diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index 1a4431b1b57..7dd0d2a10ff 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -216,7 +216,7 @@ format_udp_connection (u8 * s, va_list * args)
if (verbose)
{
if (verbose == 1)
- s = format (s, "%-15s\n", "-");
+ s = format (s, "%-15s", "-");
else
s = format (s, "\n");
}
@@ -249,9 +249,9 @@ format_udp_listener_session (u8 * s, va_list * args)
{
u32 tci = va_arg (*args, u32);
u32 __clib_unused thread_index = va_arg (*args, u32);
- u32 __clib_unused verbose = va_arg (*args, u32);
+ u32 verbose = va_arg (*args, u32);
udp_connection_t *uc = udp_listener_get (tci);
- return format (s, "%U", format_udp_connection, uc);
+ return format (s, "%U", format_udp_connection, uc, verbose);
}
u16