From 256779c85725c75de185f5cba9a4ec0c59b3151c Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 10 Apr 2020 19:52:04 +0000 Subject: udp: remove connected udp transport proto Type: refactor To reproduce functionality, use udp in combination with TRANSPORT_CFG_F_CONNECTED transport flag set in connect and listen parameters. Signed-off-by: Florin Coras Change-Id: Id88470c38326f8168b9646b0de49a674e0f4266f --- src/plugins/hs_apps/echo_client.c | 3 +-- src/plugins/hs_apps/sapi/vpp_echo_common.c | 7 ------- src/plugins/hs_apps/sapi/vpp_echo_proto_udp.c | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src/plugins/hs_apps') diff --git a/src/plugins/hs_apps/echo_client.c b/src/plugins/hs_apps/echo_client.c index e10ee59a2b7..881bbd41a0b 100644 --- a/src/plugins/hs_apps/echo_client.c +++ b/src/plugins/hs_apps/echo_client.c @@ -898,8 +898,7 @@ echo_clients_command_fn (vlib_main_t * vm, if ((rv = parse_uri ((char *) ecm->connect_uri, &sep))) return clib_error_return (0, "Uri parse error: %d", rv); ecm->transport_proto = sep.transport_proto; - ecm->is_dgram = (sep.transport_proto == TRANSPORT_PROTO_UDP - || sep.transport_proto == TRANSPORT_PROTO_UDPC); + ecm->is_dgram = (sep.transport_proto == TRANSPORT_PROTO_UDP); #if ECHO_CLIENT_PTHREAD echo_clients_start_tx_pthread (); diff --git a/src/plugins/hs_apps/sapi/vpp_echo_common.c b/src/plugins/hs_apps/sapi/vpp_echo_common.c index 60ea5a13214..497f56c3e1e 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_common.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_common.c @@ -301,10 +301,6 @@ unformat_transport_proto (unformat_input_t * input, va_list * args) *proto = TRANSPORT_PROTO_TCP; else if (unformat (input, "TCP")) *proto = TRANSPORT_PROTO_TCP; - else if (unformat (input, "udpc")) - *proto = TRANSPORT_PROTO_UDPC; - else if (unformat (input, "UDPC")) - *proto = TRANSPORT_PROTO_UDPC; else if (unformat (input, "udp")) *proto = TRANSPORT_PROTO_UDP; else if (unformat (input, "UDP")) @@ -340,9 +336,6 @@ format_transport_proto (u8 * s, va_list * args) case TRANSPORT_PROTO_TLS: s = format (s, "TLS"); break; - case TRANSPORT_PROTO_UDPC: - s = format (s, "UDPC"); - break; case TRANSPORT_PROTO_QUIC: s = format (s, "QUIC"); break; diff --git a/src/plugins/hs_apps/sapi/vpp_echo_proto_udp.c b/src/plugins/hs_apps/sapi/vpp_echo_proto_udp.c index 902b30ff1c3..456113cdd7d 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_proto_udp.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_proto_udp.c @@ -172,7 +172,6 @@ echo_proto_cb_vft_t echo_udp_proto_cb_vft = { }; ECHO_REGISTER_PROTO (TRANSPORT_PROTO_UDP, echo_udp_proto_cb_vft); -ECHO_REGISTER_PROTO (TRANSPORT_PROTO_UDPC, echo_udp_proto_cb_vft); /* * fd.io coding-style-patch-verification: ON -- cgit 1.2.3-korg