X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.c;h=46a26e484edd32a09c5ec327fa8008450f7098fa;hb=c5df8c71c;hp=96189364b34634b562d87a7e002a16827a5a58eb;hpb=067cd6229a47ea3ba8b59a2a04090e80afb5bd2c;p=vpp.git

diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index 96189364b34..46a26e484ed 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2019 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:
@@ -22,6 +22,8 @@
 #include <vnet/dpo/load_balance.h>
 #include <vnet/fib/ip4_fib.h>
 
+udp_main_t udp_main;
+
 udp_connection_t *
 udp_connection_alloc (u32 thread_index)
 {
@@ -45,7 +47,7 @@ udp_connection_alloc (u32 thread_index)
       pool_get_aligned (um->connections[thread_index], uc,
 			CLIB_CACHE_LINE_BYTES);
     }
-  memset (uc, 0, sizeof (*uc));
+  clib_memset (uc, 0, sizeof (*uc));
   uc->c_c_index = uc - um->connections[thread_index];
   uc->c_thread_index = thread_index;
   uc->c_proto = TRANSPORT_PROTO_UDP;
@@ -58,7 +60,7 @@ udp_connection_free (udp_connection_t * uc)
 {
   pool_put (udp_main.connections[uc->c_thread_index], uc);
   if (CLIB_DEBUG)
-    memset (uc, 0xFA, sizeof (*uc));
+    clib_memset (uc, 0xFA, sizeof (*uc));
 }
 
 u32
@@ -76,7 +78,7 @@ udp_session_bind (u32 session_index, transport_endpoint_t * lcl)
     return -1;
 
   pool_get (um->listener_pool, listener);
-  memset (listener, 0, sizeof (udp_connection_t));
+  clib_memset (listener, 0, sizeof (udp_connection_t));
 
   listener->c_lcl_port = lcl->port;
   listener->c_c_index = listener - um->listener_pool;
@@ -168,7 +170,7 @@ udp_session_close (u32 connection_index, u32 thread_index)
     {
       udp_unregister_dst_port (vm, clib_net_to_host_u16 (uc->c_lcl_port),
 			       uc->c_is_ip4);
-      stream_session_delete_notify (&uc->connection);
+      session_transport_delete_notify (&uc->connection);
       udp_connection_free (uc);
     }
 }
@@ -261,7 +263,7 @@ udp_send_space (transport_connection_t * t)
 }
 
 int
-udp_open_connection (transport_endpoint_t * rmt)
+udp_open_connection (transport_endpoint_cfg_t * rmt)
 {
   udp_main_t *um = vnet_get_udp_main ();
   vlib_main_t *vm = vlib_get_main ();
@@ -318,9 +320,9 @@ udp_session_get_half_open (u32 conn_index)
 
 /* *INDENT-OFF* */
 const static transport_proto_vft_t udp_proto = {
-  .bind = udp_session_bind,
-  .open = udp_open_connection,
-  .unbind = udp_session_unbind,
+  .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,
@@ -339,7 +341,7 @@ const static transport_proto_vft_t udp_proto = {
 
 
 int
-udpc_connection_open (transport_endpoint_t * rmt)
+udpc_connection_open (transport_endpoint_cfg_t * rmt)
 {
   udp_connection_t *uc;
   u32 uc_index;
@@ -362,9 +364,9 @@ udpc_connection_listen (u32 session_index, transport_endpoint_t * lcl)
 
 /* *INDENT-OFF* */
 const static transport_proto_vft_t udpc_proto = {
-  .bind = udpc_connection_listen,
-  .open = udpc_connection_open,
-  .unbind = udp_session_unbind,
+  .start_listen = udpc_connection_listen,
+  .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,
@@ -441,6 +443,66 @@ udp_init (vlib_main_t * vm)
 
 VLIB_INIT_FUNCTION (udp_init);
 
+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
  *