aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2020-04-01 02:50:13 +0000
committerDave Barach <openvpp@barachs.net>2020-04-01 19:20:55 +0000
commit9c4ec6fc2c0994c5fdbe0491f6223a9c98ed153e (patch)
tree6318a71678fb83183cd89f388ce35d3fef8013aa
parenta039620c2eec19a6c2e525645eeb0728a1c18c8d (diff)
udp: improvements to cli
Type: improvement Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I2180e8d5cae6f94a256f3b62950cf66b6ee0e59a
-rw-r--r--src/vnet/udp/udp.c55
-rw-r--r--src/vnet/udp/udp.h22
2 files changed, 64 insertions, 13 deletions
diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index 3f36ce759f3..375e95bab58 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -178,7 +178,7 @@ udp_session_bind (u32 session_index, transport_endpoint_t * lcl)
listener->c_proto = TRANSPORT_PROTO_UDP;
listener->c_s_index = session_index;
listener->c_fib_index = lcl->fib_index;
- listener->flags |= UDP_CONN_F_OWNS_PORT;
+ listener->flags |= UDP_CONN_F_OWNS_PORT | UDP_CONN_F_LISTEN;
lcl_ext = (transport_endpoint_cfg_t *) lcl;
if (lcl_ext->transport_flags & TRANSPORT_CFG_F_CONNECTED)
listener->flags |= UDP_CONN_F_CONNECTED;
@@ -286,18 +286,55 @@ format_udp_connection_id (u8 * s, va_list * args)
if (!uc)
return s;
if (uc->c_is_ip4)
- s = format (s, "[#%d][%s] %U:%d->%U:%d", uc->c_thread_index, "U",
- format_ip4_address, &uc->c_lcl_ip4,
+ s = format (s, "[%u:%u][%s] %U:%d->%U:%d", uc->c_thread_index,
+ uc->c_s_index, "U", format_ip4_address, &uc->c_lcl_ip4,
clib_net_to_host_u16 (uc->c_lcl_port), format_ip4_address,
&uc->c_rmt_ip4, clib_net_to_host_u16 (uc->c_rmt_port));
else
- s = format (s, "[#%d][%s] %U:%d->%U:%d", uc->c_thread_index, "U",
- format_ip6_address, &uc->c_lcl_ip6,
+ s = format (s, "[%u:%u][%s] %U:%d->%U:%d", uc->c_thread_index,
+ uc->c_s_index, "U", format_ip6_address, &uc->c_lcl_ip6,
clib_net_to_host_u16 (uc->c_lcl_port), format_ip6_address,
&uc->c_rmt_ip6, clib_net_to_host_u16 (uc->c_rmt_port));
return s;
}
+const char *udp_connection_flags_str[] = {
+#define _(sym, str) str,
+ foreach_udp_connection_flag
+#undef _
+};
+
+static u8 *
+format_udp_connection_flags (u8 * s, va_list * args)
+{
+ udp_connection_t *uc = va_arg (*args, udp_connection_t *);
+ int i, last = -1;
+
+ for (i = 0; i < UDP_CONN_N_FLAGS; i++)
+ if (uc->flags & (1 << i))
+ last = i;
+ for (i = 0; i < last; i++)
+ {
+ if (uc->flags & (1 << i))
+ s = format (s, "%s, ", udp_connection_flags_str[i]);
+ }
+ if (last >= 0)
+ s = format (s, "%s", udp_connection_flags_str[last]);
+ return s;
+}
+
+static u8 *
+format_udp_vars (u8 * s, va_list * args)
+{
+ udp_connection_t *uc = va_arg (*args, udp_connection_t *);
+ s = format (s, " index %u flags: %U", uc->c_c_index,
+ format_udp_connection_flags, uc);
+
+ if (!(uc->flags & UDP_CONN_F_LISTEN))
+ s = format (s, "\n");
+ return s;
+}
+
u8 *
format_udp_connection (u8 * s, va_list * args)
{
@@ -308,10 +345,10 @@ format_udp_connection (u8 * s, va_list * args)
s = format (s, "%-50U", format_udp_connection_id, uc);
if (verbose)
{
- if (verbose == 1)
- s = format (s, "%-15s", "-");
- else
- s = format (s, "\n");
+ s = format (s, "%-15s",
+ (uc->flags & UDP_CONN_F_LISTEN) ? "LISTEN" : "OPENED", uc);
+ if (verbose > 1)
+ s = format (s, "\n%U", format_udp_vars, uc);
}
return s;
}
diff --git a/src/vnet/udp/udp.h b/src/vnet/udp/udp.h
index 32e660be12f..736e3ce94f1 100644
--- a/src/vnet/udp/udp.h
+++ b/src/vnet/udp/udp.h
@@ -34,11 +34,25 @@ typedef enum
UDP_N_ERROR,
} udp_error_t;
-typedef enum
+#define foreach_udp_connection_flag \
+ _(CONNECTED, "CONNECTED") /**< connected mode */ \
+ _(OWNS_PORT, "OWNS_PORT") /**< port belong to conn (UDPC) */ \
+ _(CLOSING, "CLOSING") /**< conn closed with data */ \
+ _(LISTEN, "LISTEN") /**< conn is listening */ \
+
+enum udp_conn_flags_bits
+{
+#define _(sym, str) UDP_CONN_F_BIT_##sym,
+ foreach_udp_connection_flag
+#undef _
+ UDP_CONN_N_FLAGS
+};
+
+typedef enum udp_conn_flags_
{
- UDP_CONN_F_CONNECTED = 1 << 0, /**< connected mode */
- UDP_CONN_F_OWNS_PORT = 1 << 1, /**< port belong to conn (UDPC) */
- UDP_CONN_F_CLOSING = 1 << 2, /**< conn closed with data */
+#define _(sym, str) UDP_CONN_F_##sym = 1 << UDP_CONN_F_BIT_##sym,
+ foreach_udp_connection_flag
+#undef _
} udp_conn_flags_t;
typedef struct