X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.c;h=98164b127051d8122ae12fbb90077bcb23866b38;hb=1b026cb028d6bcf24d243f633352b7ac58ce5c00;hp=3f36ce759f345a0cd541446188273f5101392a4b;hpb=a039620c2eec19a6c2e525645eeb0728a1c18c8d;p=vpp.git

diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index 3f36ce759f3..98164b12705 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2020 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -13,14 +13,11 @@
  * limitations under the License.
  */
 
-/** @file
-    udp state machine, etc.
-*/
-
 #include <vnet/udp/udp.h>
 #include <vnet/session/session.h>
 #include <vnet/dpo/load_balance.h>
-#include <vnet/fib/ip4_fib.h>
+#include <vnet/ip/ip4_inlines.h>
+#include <vnet/ip/ip6_inlines.h>
 #include <vppinfra/sparse_vec.h>
 
 udp_main_t udp_main;
@@ -119,7 +116,6 @@ udp_connection_alloc (u32 thread_index)
   uc->c_c_index = uc - um->connections[thread_index];
   uc->c_thread_index = thread_index;
   uc->c_proto = TRANSPORT_PROTO_UDP;
-  clib_spinlock_init (&uc->rx_lock);
   return uc;
 }
 
@@ -127,37 +123,63 @@ void
 udp_connection_free (udp_connection_t * uc)
 {
   u32 thread_index = uc->c_thread_index;
+  clib_spinlock_free (&uc->rx_lock);
   if (CLIB_DEBUG)
     clib_memset (uc, 0xFA, sizeof (*uc));
   pool_put (udp_main.connections[thread_index], uc);
 }
 
-void
-udp_connection_delete (udp_connection_t * uc)
+static void
+udp_connection_cleanup (udp_connection_t * uc)
 {
+  transport_endpoint_cleanup (TRANSPORT_PROTO_UDP, &uc->c_lcl_ip,
+			      uc->c_lcl_port);
   udp_connection_unregister_port (clib_net_to_host_u16 (uc->c_lcl_port),
 				  uc->c_is_ip4);
-  session_transport_delete_notify (&uc->connection);
   udp_connection_free (uc);
 }
 
-u32
-udp_session_bind (u32 session_index, transport_endpoint_t * lcl)
+void
+udp_connection_delete (udp_connection_t * uc)
+{
+  session_transport_delete_notify (&uc->connection);
+  udp_connection_cleanup (uc);
+}
+
+static u8
+udp_connection_port_used_extern (u16 lcl_port, u8 is_ip4)
+{
+  udp_main_t *um = vnet_get_udp_main ();
+  udp_dst_port_info_t *pi;
+
+  pi = udp_get_dst_port_info (um, lcl_port, is_ip4);
+  return (pi && !pi->n_connections
+	  && udp_is_valid_dst_port (lcl_port, is_ip4));
+}
+
+static u16
+udp_default_mtu (udp_main_t * um, u8 is_ip4)
+{
+  u16 ip_hlen = is_ip4 ? sizeof (ip4_header_t) : sizeof (ip6_header_t);
+  return (um->default_mtu - sizeof (udp_header_t) - ip_hlen);
+}
+
+static u32
+udp_session_bind (u32 session_index, transport_endpoint_cfg_t *lcl)
 {
   udp_main_t *um = vnet_get_udp_main ();
   vlib_main_t *vm = vlib_get_main ();
   transport_endpoint_cfg_t *lcl_ext;
   udp_connection_t *listener;
-  udp_dst_port_info_t *pi;
+  u16 lcl_port_ho;
   void *iface_ip;
 
-  pi = udp_get_dst_port_info (um, clib_net_to_host_u16 (lcl->port),
-			      lcl->is_ip4);
+  lcl_port_ho = clib_net_to_host_u16 (lcl->port);
 
-  if (pi && !pi->n_connections)
+  if (udp_connection_port_used_extern (lcl_port_ho, lcl->is_ip4))
     {
       clib_warning ("port already used");
-      return -1;
+      return SESSION_E_PORTINUSE;
     }
 
   pool_get (um->listener_pool, listener);
@@ -178,7 +200,8 @@ 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->mss = udp_default_mtu (um, listener->c_is_ip4);
+  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;
@@ -186,12 +209,11 @@ udp_session_bind (u32 session_index, transport_endpoint_t * lcl)
     listener->c_flags |= TRANSPORT_CONNECTION_F_CLESS;
   clib_spinlock_init (&listener->rx_lock);
 
-  udp_connection_register_port (vm, clib_net_to_host_u16 (lcl->port),
-				lcl->is_ip4);
+  udp_connection_register_port (vm, lcl_port_ho, lcl->is_ip4);
   return listener->c_c_index;
 }
 
-u32
+static u32
 udp_session_unbind (u32 listener_index)
 {
   udp_main_t *um = &udp_main;
@@ -200,11 +222,12 @@ udp_session_unbind (u32 listener_index)
   listener = udp_listener_get (listener_index);
   udp_connection_unregister_port (clib_net_to_host_u16 (listener->c_lcl_port),
 				  listener->c_is_ip4);
+  clib_spinlock_free (&listener->rx_lock);
   pool_put (um->listener_pool, listener);
   return 0;
 }
 
-transport_connection_t *
+static transport_connection_t *
 udp_session_get_listener (u32 listener_index)
 {
   udp_connection_t *us;
@@ -213,29 +236,54 @@ udp_session_get_listener (u32 listener_index)
   return &us->connection;
 }
 
-u32
-udp_push_header (transport_connection_t * tc, vlib_buffer_t * b)
+always_inline u32
+udp_push_one_header (vlib_main_t *vm, udp_connection_t *uc, vlib_buffer_t *b)
 {
-  udp_connection_t *uc;
-  vlib_main_t *vm = vlib_get_main ();
-
-  uc = udp_get_connection_from_transport (tc);
-
   vlib_buffer_push_udp (b, uc->c_lcl_port, uc->c_rmt_port, 1);
-  if (tc->is_ip4)
-    vlib_buffer_push_ip4 (vm, b, &uc->c_lcl_ip4, &uc->c_rmt_ip4,
-			  IP_PROTOCOL_UDP, 1);
+  if (uc->c_is_ip4)
+    vlib_buffer_push_ip4_custom (vm, b, &uc->c_lcl_ip4, &uc->c_rmt_ip4,
+				 IP_PROTOCOL_UDP, 1 /* csum offload */,
+				 0 /* is_df */, uc->c_dscp);
   else
-    {
-      ip6_header_t *ih;
-      ih = vlib_buffer_push_ip6 (vm, b, &uc->c_lcl_ip6, &uc->c_rmt_ip6,
-				 IP_PROTOCOL_UDP);
-      vnet_buffer (b)->l3_hdr_offset = (u8 *) ih - b->data;
-    }
+    vlib_buffer_push_ip6 (vm, b, &uc->c_lcl_ip6, &uc->c_rmt_ip6,
+			  IP_PROTOCOL_UDP);
   vnet_buffer (b)->sw_if_index[VLIB_RX] = 0;
   vnet_buffer (b)->sw_if_index[VLIB_TX] = uc->c_fib_index;
   b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
 
+  return 0;
+}
+
+static u32
+udp_push_header (transport_connection_t *tc, vlib_buffer_t **bs, u32 n_bufs)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  udp_connection_t *uc;
+
+  uc = udp_connection_from_transport (tc);
+
+  while (n_bufs >= 4)
+    {
+      vlib_prefetch_buffer_header (bs[2], STORE);
+      vlib_prefetch_buffer_header (bs[3], STORE);
+
+      udp_push_one_header (vm, uc, bs[0]);
+      udp_push_one_header (vm, uc, bs[1]);
+
+      n_bufs -= 2;
+      bs += 2;
+    }
+  while (n_bufs)
+    {
+      if (n_bufs > 1)
+	vlib_prefetch_buffer_header (bs[1], STORE);
+
+      udp_push_one_header (vm, uc, bs[0]);
+
+      n_bufs -= 1;
+      bs += 1;
+    }
+
   if (PREDICT_FALSE (uc->flags & UDP_CONN_F_CLOSING))
     {
       if (!transport_max_tx_dequeue (&uc->connection))
@@ -245,7 +293,7 @@ udp_push_header (transport_connection_t * tc, vlib_buffer_t * b)
   return 0;
 }
 
-transport_connection_t *
+static transport_connection_t *
 udp_session_get (u32 connection_index, u32 thread_index)
 {
   udp_connection_t *uc;
@@ -255,13 +303,13 @@ udp_session_get (u32 connection_index, u32 thread_index)
   return 0;
 }
 
-void
+static void
 udp_session_close (u32 connection_index, u32 thread_index)
 {
   udp_connection_t *uc;
 
   uc = udp_connection_get (connection_index, thread_index);
-  if (!uc)
+  if (!uc || (uc->flags & UDP_CONN_F_MIGRATED))
     return;
 
   if (!transport_max_tx_dequeue (&uc->connection))
@@ -270,114 +318,75 @@ udp_session_close (u32 connection_index, u32 thread_index)
     uc->flags |= UDP_CONN_F_CLOSING;
 }
 
-void
+static void
 udp_session_cleanup (u32 connection_index, u32 thread_index)
 {
   udp_connection_t *uc;
   uc = udp_connection_get (connection_index, thread_index);
-  if (uc)
-    udp_connection_free (uc);
-}
-
-u8 *
-format_udp_connection_id (u8 * s, va_list * args)
-{
-  udp_connection_t *uc = va_arg (*args, udp_connection_t *);
   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,
-		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));
+    return;
+  if (uc->flags & UDP_CONN_F_MIGRATED)
+    udp_connection_free (uc);
   else
-    s = format (s, "[#%d][%s] %U:%d->%U:%d", uc->c_thread_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;
-}
-
-u8 *
-format_udp_connection (u8 * s, va_list * args)
-{
-  udp_connection_t *uc = va_arg (*args, udp_connection_t *);
-  u32 verbose = va_arg (*args, u32);
-  if (!uc)
-    return s;
-  s = format (s, "%-50U", format_udp_connection_id, uc);
-  if (verbose)
-    {
-      if (verbose == 1)
-	s = format (s, "%-15s", "-");
-      else
-	s = format (s, "\n");
-    }
-  return s;
-}
-
-u8 *
-format_udp_session (u8 * s, va_list * args)
-{
-  u32 uci = va_arg (*args, u32);
-  u32 thread_index = va_arg (*args, u32);
-  u32 verbose = va_arg (*args, u32);
-  udp_connection_t *uc;
-
-  uc = udp_connection_get (uci, thread_index);
-  return format (s, "%U", format_udp_connection, uc, verbose);
-}
-
-u8 *
-format_udp_half_open_session (u8 * s, va_list * args)
-{
-  u32 __clib_unused tci = va_arg (*args, u32);
-  u32 __clib_unused thread_index = va_arg (*args, u32);
-  clib_warning ("BUG");
-  return 0;
-}
-
-u8 *
-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 verbose = va_arg (*args, u32);
-  udp_connection_t *uc = udp_listener_get (tci);
-  return format (s, "%U", format_udp_connection, uc, verbose);
+    udp_connection_cleanup (uc);
 }
 
 static int
 udp_session_send_params (transport_connection_t * tconn,
 			 transport_send_params_t * sp)
 {
+  udp_connection_t *uc;
+
+  uc = udp_connection_from_transport (tconn);
+
   /* No constraint on TX window */
   sp->snd_space = ~0;
   /* TODO figure out MTU of output interface */
-  sp->snd_mss = 1460;
+  sp->snd_mss = uc->mss;
   sp->tx_offset = 0;
   sp->flags = 0;
   return 0;
 }
 
-int
+static int
 udp_open_connection (transport_endpoint_cfg_t * rmt)
 {
   vlib_main_t *vm = vlib_get_main ();
   u32 thread_index = vm->thread_index;
-  udp_connection_t *uc;
+  udp_main_t *um = &udp_main;
   ip46_address_t lcl_addr;
+  udp_connection_t *uc;
   u16 lcl_port;
+  int rv;
 
-  if (transport_alloc_local_endpoint (TRANSPORT_PROTO_UDP, rmt, &lcl_addr,
-				      &lcl_port))
-    return -1;
+  rv = transport_alloc_local_endpoint (TRANSPORT_PROTO_UDP, rmt, &lcl_addr,
+				       &lcl_port);
+  if (rv)
+    {
+      if (rv != SESSION_E_PORTINUSE)
+	return rv;
+
+      if (udp_connection_port_used_extern (lcl_port, rmt->is_ip4))
+	return SESSION_E_PORTINUSE;
+
+      /* If port in use, check if 5-tuple is also in use */
+      if (session_lookup_connection (rmt->fib_index, &lcl_addr, &rmt->ip,
+				     lcl_port, rmt->port, TRANSPORT_PROTO_UDP,
+				     rmt->is_ip4))
+	return SESSION_E_PORTINUSE;
+
+      /* 5-tuple is available so increase lcl endpoint refcount and proceed
+       * with connection allocation */
+      transport_share_local_endpoint (TRANSPORT_PROTO_UDP, &lcl_addr,
+				      lcl_port);
+      goto conn_alloc;
+    }
 
   if (udp_is_valid_dst_port (lcl_port, rmt->is_ip4))
     {
       /* If specific source port was requested abort */
       if (rmt->peer.port)
-	return -1;
+	return SESSION_E_PORTINUSE;
 
       /* Try to find a port that's not used */
       while (udp_is_valid_dst_port (lcl_port, rmt->is_ip4))
@@ -385,18 +394,16 @@ udp_open_connection (transport_endpoint_cfg_t * rmt)
 	  lcl_port = transport_alloc_local_port (TRANSPORT_PROTO_UDP,
 						 &lcl_addr);
 	  if (lcl_port < 1)
-	    {
-	      clib_warning ("Failed to allocate src port");
-	      return -1;
-	    }
+	    return SESSION_E_PORTINUSE;
 	}
     }
 
+conn_alloc:
+
   udp_connection_register_port (vm, lcl_port, rmt->is_ip4);
 
   /* We don't poll main thread if we have workers */
-  if (vlib_num_workers ())
-    thread_index = 1;
+  thread_index = transport_cl_thread ();
 
   uc = udp_connection_alloc (thread_index);
   ip_copy (&uc->c_rmt_ip, &rmt->ip, rmt->is_ip4);
@@ -406,90 +413,72 @@ udp_open_connection (transport_endpoint_cfg_t * rmt)
   uc->c_is_ip4 = rmt->is_ip4;
   uc->c_proto = TRANSPORT_PROTO_UDP;
   uc->c_fib_index = rmt->fib_index;
+  uc->c_dscp = rmt->dscp;
+  uc->mss = rmt->mss ? rmt->mss : udp_default_mtu (um, uc->c_is_ip4);
   uc->flags |= UDP_CONN_F_OWNS_PORT;
   if (rmt->transport_flags & TRANSPORT_CFG_F_CONNECTED)
-    uc->flags |= UDP_CONN_F_CONNECTED;
+    {
+      uc->flags |= UDP_CONN_F_CONNECTED;
+    }
   else
-    uc->c_flags |= TRANSPORT_CONNECTION_F_CLESS;
+    {
+      clib_spinlock_init (&uc->rx_lock);
+      uc->c_flags |= TRANSPORT_CONNECTION_F_CLESS;
+    }
 
   return uc->c_c_index;
 }
 
-transport_connection_t *
+static transport_connection_t *
 udp_session_get_half_open (u32 conn_index)
 {
   udp_connection_t *uc;
   u32 thread_index;
 
   /* We don't poll main thread if we have workers */
-  thread_index = vlib_num_workers ()? 1 : 0;
+  thread_index = transport_cl_thread ();
   uc = udp_connection_get (conn_index, thread_index);
   if (!uc)
     return 0;
   return &uc->connection;
 }
 
-/* *INDENT-OFF* */
-static const transport_proto_vft_t udp_proto = {
-  .start_listen = udp_session_bind,
-  .connect = udp_open_connection,
-  .stop_listen = udp_session_unbind,
-  .push_header = udp_push_header,
-  .get_connection = udp_session_get,
-  .get_listener = udp_session_get_listener,
-  .get_half_open = udp_session_get_half_open,
-  .close = udp_session_close,
-  .cleanup = udp_session_cleanup,
-  .send_params = udp_session_send_params,
-  .format_connection = format_udp_session,
-  .format_half_open = format_udp_half_open_session,
-  .format_listener = format_udp_listener_session,
-  .transport_options = {
-    .name = "udp",
-    .short_name = "U",
-    .tx_type = TRANSPORT_TX_DGRAM,
-    .service_type = TRANSPORT_SERVICE_CL,
-  },
-};
-/* *INDENT-ON* */
+static u8 *
+format_udp_session (u8 * s, va_list * args)
+{
+  u32 uci = va_arg (*args, u32);
+  u32 thread_index = va_arg (*args, u32);
+  u32 verbose = va_arg (*args, u32);
+  udp_connection_t *uc;
 
+  uc = udp_connection_get (uci, thread_index);
+  return format (s, "%U", format_udp_connection, uc, verbose);
+}
 
-int
-udpc_connection_open (transport_endpoint_cfg_t * rmt)
+static u8 *
+format_udp_half_open_session (u8 * s, va_list * args)
 {
-  udp_connection_t *uc;
-  /* Reproduce the logic of udp_open_connection to find the correct thread */
-  u32 thread_index = vlib_num_workers ()? 1 : vlib_get_main ()->thread_index;
-  u32 uc_index;
-  uc_index = udp_open_connection (rmt);
-  if (uc_index == (u32) ~ 0)
-    return -1;
-  uc = udp_connection_get (uc_index, thread_index);
-  uc->flags |= UDP_CONN_F_CONNECTED;
-  return uc_index;
+  u32 __clib_unused tci = va_arg (*args, u32);
+  u32 __clib_unused thread_index = va_arg (*args, u32);
+  clib_warning ("BUG");
+  return 0;
 }
 
-u32
-udpc_connection_listen (u32 session_index, transport_endpoint_t * lcl)
+static u8 *
+format_udp_listener_session (u8 * s, va_list * args)
 {
-  udp_connection_t *listener;
-  u32 li_index;
-  li_index = udp_session_bind (session_index, lcl);
-  if (li_index == (u32) ~ 0)
-    return -1;
-  listener = udp_listener_get (li_index);
-  listener->flags |= UDP_CONN_F_CONNECTED;
-  /* Fake udp listener, i.e., make sure session layer adds a udp instead of
-   * udpc listener to the lookup table */
-  ((session_endpoint_cfg_t *) lcl)->transport_proto = TRANSPORT_PROTO_UDP;
-  return li_index;
+  u32 tci = va_arg (*args, u32);
+  u32 __clib_unused thread_index = 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, verbose);
 }
 
 /* *INDENT-OFF* */
-static const transport_proto_vft_t udpc_proto = {
-  .start_listen = udpc_connection_listen,
+static const transport_proto_vft_t udp_proto = {
+  .start_listen = udp_session_bind,
+  .connect = udp_open_connection,
   .stop_listen = udp_session_unbind,
-  .connect = udpc_connection_open,
   .push_header = udp_push_header,
   .get_connection = udp_session_get,
   .get_listener = udp_session_get_listener,
@@ -501,11 +490,10 @@ static const transport_proto_vft_t udpc_proto = {
   .format_half_open = format_udp_half_open_session,
   .format_listener = format_udp_listener_session,
   .transport_options = {
-    .name = "udpc",
+    .name = "udp",
     .short_name = "U",
     .tx_type = TRANSPORT_TX_DGRAM,
-    .service_type = TRANSPORT_SERVICE_VC,
-    .half_open_has_fifos = 1
+    .service_type = TRANSPORT_SERVICE_CL,
   },
 };
 /* *INDENT-ON* */
@@ -536,10 +524,6 @@ udp_init (vlib_main_t * vm)
 			       FIB_PROTOCOL_IP4, ip4_lookup_node.index);
   transport_register_protocol (TRANSPORT_PROTO_UDP, &udp_proto,
 			       FIB_PROTOCOL_IP6, ip6_lookup_node.index);
-  transport_register_protocol (TRANSPORT_PROTO_UDPC, &udpc_proto,
-			       FIB_PROTOCOL_IP4, ip4_lookup_node.index);
-  transport_register_protocol (TRANSPORT_PROTO_UDPC, &udpc_proto,
-			       FIB_PROTOCOL_IP6, ip6_lookup_node.index);
 
   /*
    * Initialize data structures
@@ -562,6 +546,8 @@ udp_init (vlib_main_t * vm)
     vlib_node_add_next (vm, udp4_local_node.index, udp4_input_node.index);
   um->local_to_input_edge[UDP_IP6] =
     vlib_node_add_next (vm, udp6_local_node.index, udp6_input_node.index);
+
+  um->default_mtu = 1500;
   return 0;
 }
 
@@ -573,67 +559,6 @@ VLIB_INIT_FUNCTION (udp_init) =
 };
 /* *INDENT-ON* */
 
-
-static clib_error_t *
-show_udp_punt_fn (vlib_main_t * vm, unformat_input_t * input,
-		  vlib_cli_command_t * cmd_arg)
-{
-  udp_main_t *um = vnet_get_udp_main ();
-
-  clib_error_t *error = NULL;
-
-  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    return clib_error_return (0, "unknown input `%U'", format_unformat_error,
-			      input);
-
-  udp_dst_port_info_t *port_info;
-  if (um->punt_unknown4)
-    {
-      vlib_cli_output (vm, "IPv4 UDP punt: enabled");
-    }
-  else
-    {
-      u8 *s = NULL;
-      vec_foreach (port_info, um->dst_port_infos[UDP_IP4])
-      {
-	if (udp_is_valid_dst_port (port_info->dst_port, 1))
-	  {
-	    s = format (s, (!s) ? "%d" : ", %d", port_info->dst_port);
-	  }
-      }
-      s = format (s, "%c", 0);
-      vlib_cli_output (vm, "IPV4 UDP ports punt : %s", s);
-    }
-
-  if (um->punt_unknown6)
-    {
-      vlib_cli_output (vm, "IPv6 UDP punt: enabled");
-    }
-  else
-    {
-      u8 *s = NULL;
-      vec_foreach (port_info, um->dst_port_infos[UDP_IP6])
-      {
-	if (udp_is_valid_dst_port (port_info->dst_port, 01))
-	  {
-	    s = format (s, (!s) ? "%d" : ", %d", port_info->dst_port);
-	  }
-      }
-      s = format (s, "%c", 0);
-      vlib_cli_output (vm, "IPV6 UDP ports punt : %s", s);
-    }
-
-  return (error);
-}
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (show_tcp_punt_command, static) =
-{
-  .path = "show udp punt",
-  .short_help = "show udp punt [ipv4|ipv6]",
-  .function = show_udp_punt_fn,
-};
-/* *INDENT-ON* */
-
 /*
  * fd.io coding-style-patch-verification: ON
  *