misc: minimize dependencies on udp.h

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Id13f33843b230a1d169560742c4f7b2dc17d8718

diff --git a/src/plugins/cnat/cnat_session.h b/src/plugins/cnat/cnat_session.h
index 83b8cd6..a1f3486 100644 (file)
--- a/src/plugins/cnat/cnat_session.h
+++ b/src/plugins/cnat/cnat_session.h
@@ -16,7 +16,7 @@
 #ifndef __CNAT_SESSION_H__
 #define __CNAT_SESSION_H__
 
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 
 #include <cnat/cnat_types.h>
 #include <cnat/cnat_client.h>

diff --git a/src/plugins/dhcp/dhcp6_client_common_dp.c b/src/plugins/dhcp/dhcp6_client_common_dp.c
index e42ec3f..f8a96f1 100644 (file)
--- a/src/plugins/dhcp/dhcp6_client_common_dp.c
+++ b/src/plugins/dhcp/dhcp6_client_common_dp.c
@@ -19,7 +19,8 @@
 #include <dhcp/dhcp6_ia_na_client_dp.h>
 #include <dhcp/dhcp6_pd_client_dp.h>
 #include <dhcp/dhcp6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
+#include <vnet/udp/udp_packet.h>
 
 dhcp6_client_common_main_t dhcp6_client_common_main;
 dhcpv6_duid_ll_string_t client_duid;

diff --git a/src/plugins/dhcp/dhcp_client_detect.c b/src/plugins/dhcp/dhcp_client_detect.c
index 31b8985..598bd16 100644 (file)
--- a/src/plugins/dhcp/dhcp_client_detect.c
+++ b/src/plugins/dhcp/dhcp_client_detect.c
@@ -16,7 +16,7 @@
  */
 
 #include <dhcp/client.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 
 #define foreach_dhcp_client_detect                    \
   _(EXTRACT, "Extract")

diff --git a/src/plugins/dhcp/dhcp_proxy.h b/src/plugins/dhcp/dhcp_proxy.h
index 4810ae5..3466f0c 100644 (file)
--- a/src/plugins/dhcp/dhcp_proxy.h
+++ b/src/plugins/dhcp/dhcp_proxy.h
@@ -25,7 +25,7 @@
 #include <vnet/ip/ip4.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/format.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 
 typedef enum
 {

diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c
index bdf1496..045f4d6 100644 (file)
--- a/src/plugins/dns/dns.c
+++ b/src/plugins/dns/dns.c
@@ -14,7 +14,7 @@
  */
 
 #include <vnet/vnet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/plugin/plugin.h>
 #include <vnet/fib/fib_table.h>
 #include <dns/dns.h>

diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c
index d6a55ec..8becb82 100644 (file)
--- a/src/plugins/dpdk/ipsec/esp_encrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_encrypt.c
@@ -21,7 +21,7 @@
 
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/esp.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <dpdk/buffer.h>
 #include <dpdk/ipsec/ipsec.h>
 #include <vnet/ipsec/ipsec_tun.h>

diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c
index 18e0d06..9bc12c8 100644 (file)
--- a/src/plugins/flowprobe/flowprobe.c
+++ b/src/plugins/flowprobe/flowprobe.c
@@ -26,6 +26,7 @@
 #include <vnet/vnet.h>
 #include <vpp/app/version.h>
 #include <vnet/plugin/plugin.h>
+#include <vnet/udp/udp_local.h>
 #include <flowprobe/flowprobe.h>
 
 #include <vlibapi/api.h>

diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c
index 0ec1d27..a976830 100644 (file)
--- a/src/plugins/flowprobe/node.c
+++ b/src/plugins/flowprobe/node.c
@@ -20,6 +20,7 @@
 #include <vppinfra/error.h>
 #include <flowprobe/flowprobe.h>
 #include <vnet/ip/ip6_packet.h>
+#include <vnet/udp/udp_local.h>
 #include <vlibmemory/api.h>
 
 static void flowprobe_export_entry (vlib_main_t * vm, flowprobe_entry_t * e);

diff --git a/src/plugins/geneve/geneve.h b/src/plugins/geneve/geneve.h
index 029f753..d41a49a 100644 (file)
--- a/src/plugins/geneve/geneve.h
+++ b/src/plugins/geneve/geneve.h
@@ -29,7 +29,8 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/dpo/dpo.h>
 #include <vnet/adj/adj_types.h>
 

diff --git a/src/plugins/gtpu/gtpu.h b/src/plugins/gtpu/gtpu.h
index 0761641..8f3b654 100644 (file)
--- a/src/plugins/gtpu/gtpu.h
+++ b/src/plugins/gtpu/gtpu.h
@@ -30,7 +30,8 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/dpo/dpo.h>
 #include <vnet/adj/adj_types.h>
 #include <vnet/fib/fib_table.h>

diff --git a/src/plugins/ikev2/ikev2_cli.c b/src/plugins/ikev2/ikev2_cli.c
index ad9ae60..a2d5ad2 100644 (file)
--- a/src/plugins/ikev2/ikev2_cli.c
+++ b/src/plugins/ikev2/ikev2_cli.c
@@ -15,7 +15,6 @@
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vppinfra/error.h>
-#include <vnet/udp/udp.h>
 #include <vnet/ipsec/ipsec_sa.h>
 #include <plugins/ikev2/ikev2.h>
 #include <plugins/ikev2/ikev2_priv.h>

diff --git a/src/plugins/ikev2/ikev2_crypto.c b/src/plugins/ikev2/ikev2_crypto.c
index 7f4fac5..a9ab1bc 100644 (file)
--- a/src/plugins/ikev2/ikev2_crypto.c
+++ b/src/plugins/ikev2/ikev2_crypto.c
@@ -16,7 +16,6 @@
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vppinfra/error.h>
-#include <vnet/udp/udp.h>
 #include <plugins/ikev2/ikev2.h>
 #include <plugins/ikev2/ikev2_priv.h>
 #include <openssl/obj_mac.h>

diff --git a/src/plugins/ioam/analyse/ioam_summary_export.c b/src/plugins/ioam/analyse/ioam_summary_export.c
index 12907d8..032272f 100644 (file)
--- a/src/plugins/ioam/analyse/ioam_summary_export.c
+++ b/src/plugins/ioam/analyse/ioam_summary_export.c
@@ -15,6 +15,7 @@
 
 #include <vlib/vlib.h>
 #include <vnet/ip/ip6_packet.h>
+#include <vnet/udp/udp_local.h>
 #include <ioam/analyse/ioam_summary_export.h>
 #include <ioam/analyse/ip6/ip6_ioam_analyse.h>
 

diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h
index b1bca9b..f242ad7 100644 (file)
--- a/src/plugins/ioam/export-common/ioam_export.h
+++ b/src/plugins/ioam/export-common/ioam_export.h
@@ -21,7 +21,8 @@
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/ipfix-export/ipfix_packet.h>
 
 #include <vppinfra/pool.h>

diff --git a/src/plugins/ioam/ipfixcollector/ipfixcollector.c b/src/plugins/ioam/ipfixcollector/ipfixcollector.c
index 37b828c..d4f57c5 100644 (file)
--- a/src/plugins/ioam/ipfixcollector/ipfixcollector.c
+++ b/src/plugins/ioam/ipfixcollector/ipfixcollector.c
@@ -15,7 +15,7 @@
 
 #include <vnet/ip/ip.h>
 #include <vnet/plugin/plugin.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <ioam/ipfixcollector/ipfixcollector.h>
 
 ipfix_collector_main_t ipfix_collector_main;

diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
index 7567f31..215f14b 100644 (file)
--- a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
@@ -16,7 +16,7 @@
 #include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>

diff --git a/src/plugins/ioam/udp-ping/udp_ping_export.c b/src/plugins/ioam/udp-ping/udp_ping_export.c
index 3c632c8..3e83598 100644 (file)
--- a/src/plugins/ioam/udp-ping/udp_ping_export.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_export.c
@@ -16,6 +16,8 @@
 #include <vnet/ipfix-export/flow_report.h>
 #include <ioam/analyse/ioam_summary_export.h>
 #include <vnet/api_errno.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/udp/udp_local.h>
 #include <ioam/udp-ping/udp_ping.h>
 
 #define UDP_PING_EXPORT_RECORD_SIZE 400

diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index ab5e808..21a1484 100644 (file)
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -17,7 +17,7 @@
 #include <vnet/plugin/plugin.h>
 #include <vpp/app/version.h>
 #include <vnet/api_errno.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vppinfra/lock.h>
 
 //GC runs at most once every so many seconds

diff --git a/src/plugins/lisp/lisp-gpe/interface.c b/src/plugins/lisp/lisp-gpe/interface.c
index 0d5f689..1d2abaf 100644 (file)
--- a/src/plugins/lisp/lisp-gpe/interface.c
+++ b/src/plugins/lisp/lisp-gpe/interface.c
@@ -23,7 +23,7 @@
 #include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_inlines.h>
 #include <vnet/ethernet/ethernet.h>
 #include <lisp/lisp-gpe/lisp_gpe.h>
 #include <lisp/lisp-gpe/lisp_gpe_fwd_entry.h>

diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe.h b/src/plugins/lisp/lisp-gpe/lisp_gpe.h
index aa2e7d1..10dc4fe 100644 (file)
--- a/src/plugins/lisp/lisp-gpe/lisp_gpe.h
+++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.h
@@ -27,7 +27,8 @@
 #include <vnet/l2/l2_input.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
+#include <vnet/udp/udp_local.h>
 #include <lisp/lisp-cp/lisp_types.h>
 #include <lisp/lisp-gpe/lisp_gpe_packet.h>
 #include <vnet/adj/adj_types.h>

diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c
index eab10f4..d93f3ab 100644 (file)
--- a/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c
+++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c
@@ -26,6 +26,7 @@
 #include <lisp/lisp-gpe/lisp_gpe_tunnel.h>
 #include <vnet/fib/fib_entry.h>
 #include <vnet/adj/adj_midchain.h>
+#include <vnet/udp/udp_inlines.h>
 #include <vppinfra/bihash_24_8.h>
 #include <vppinfra/bihash_template.h>
 

diff --git a/src/plugins/nat/in2out.c b/src/plugins/nat/in2out.c
index 5f67f9b..ff463ef 100644 (file)
--- a/src/plugins/nat/in2out.c
+++ b/src/plugins/nat/in2out.c
@@ -23,7 +23,7 @@
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/fib/ip4_fib.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <nat/nat.h>
 #include <nat/lib/ipfix_logging.h>
 #include <nat/nat_inlines.h>

diff --git a/src/plugins/nat/in2out_ed.c b/src/plugins/nat/in2out_ed.c
index f52026b..f0bb0f9 100644 (file)
--- a/src/plugins/nat/in2out_ed.c
+++ b/src/plugins/nat/in2out_ed.c
@@ -22,7 +22,7 @@
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/fib/ip4_fib.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vppinfra/error.h>
 #include <nat/nat.h>
 #include <nat/lib/ipfix_logging.h>

diff --git a/src/plugins/nat/lib/inlines.h b/src/plugins/nat/lib/inlines.h
index 1079449..fe1f7dd 100644 (file)
--- a/src/plugins/nat/lib/inlines.h
+++ b/src/plugins/nat/lib/inlines.h
@@ -18,6 +18,8 @@
 #ifndef included_nat_inlines_h__
 #define included_nat_inlines_h__
 
+#include <vnet/ip/icmp46_packet.h>
+
 always_inline nat_protocol_t
 ip_proto_to_nat_proto (u8 ip_proto)
 {

diff --git a/src/plugins/nat/lib/ipfix_logging.c b/src/plugins/nat/lib/ipfix_logging.c
index e4fc0ce..7226fb7 100644 (file)
--- a/src/plugins/nat/lib/ipfix_logging.c
+++ b/src/plugins/nat/lib/ipfix_logging.c
@@ -16,6 +16,8 @@
  */
 
 #include <vnet/ipfix-export/flow_report.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/udp/udp_local.h>
 #include <vlibmemory/api.h>
 #include <vppinfra/atomics.h>
 #include <nat/lib/ipfix_logging.h>

diff --git a/src/plugins/nat/nat64/nat64_out2in.c b/src/plugins/nat/nat64/nat64_out2in.c
index 108edf0..5c5554b 100644 (file)
--- a/src/plugins/nat/nat64/nat64_out2in.c
+++ b/src/plugins/nat/nat64/nat64_out2in.c
@@ -16,7 +16,7 @@
 #include <nat/nat64/nat64.h>
 #include <vnet/ip/ip4_to_ip6.h>
 #include <vnet/fib/ip4_fib.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 
 typedef struct
 {

diff --git a/src/plugins/nat/nat_ha.c b/src/plugins/nat/nat_ha.c
index 11b4ba8..ddfa3e4 100644 (file)
--- a/src/plugins/nat/nat_ha.c
+++ b/src/plugins/nat/nat_ha.c
@@ -14,7 +14,7 @@
  */
 
 #include "nat_ha.h"
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <nat/nat.h>
 #include <vppinfra/atomics.h>
 

diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c
index 99a4bb4..dc1d087 100644 (file)
--- a/src/plugins/nat/out2in.c
+++ b/src/plugins/nat/out2in.c
@@ -21,7 +21,7 @@
 #include <vnet/vnet.h>
 
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/fib/ip4_fib.h>
 #include <nat/nat.h>

diff --git a/src/plugins/nat/out2in_ed.c b/src/plugins/nat/out2in_ed.c
index e9fbc59..703c854 100644 (file)
--- a/src/plugins/nat/out2in_ed.c
+++ b/src/plugins/nat/out2in_ed.c
@@ -22,7 +22,7 @@
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/fib/ip4_fib.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vppinfra/error.h>
 #include <nat/nat.h>
 #include <nat/lib/ipfix_logging.h>

diff --git a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c
index b69cd74..876e003 100644 (file)
--- a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c
+++ b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c
@@ -16,7 +16,7 @@
 #include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/ethernet/ethernet.h>
 #include <lisp/lisp-gpe/lisp_gpe_packet.h>
 #include <nsh/nsh.h>

diff --git a/src/plugins/oddbuf/oddbuf.h b/src/plugins/oddbuf/oddbuf.h
index c2c07e7..d908e53 100644 (file)
--- a/src/plugins/oddbuf/oddbuf.h
+++ b/src/plugins/oddbuf/oddbuf.h
@@ -20,7 +20,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
 #include <vnet/ethernet/ethernet.h>
 
 #include <vppinfra/hash.h>

diff --git a/src/plugins/wireguard/wireguard.c b/src/plugins/wireguard/wireguard.c
index 9510a0a..f74a128 100755 (executable)
--- a/src/plugins/wireguard/wireguard.c
+++ b/src/plugins/wireguard/wireguard.c
@@ -17,7 +17,6 @@
 #include <vnet/plugin/plugin.h>
 #include <vnet/ipip/ipip.h>
 #include <vpp/app/version.h>
-#include <vnet/udp/udp.h>
 
 #include <wireguard/wireguard_send.h>
 #include <wireguard/wireguard_key.h>

diff --git a/src/plugins/wireguard/wireguard_send.c b/src/plugins/wireguard/wireguard_send.c
index e520e92..f492e05 100755 (executable)
--- a/src/plugins/wireguard/wireguard_send.c
+++ b/src/plugins/wireguard/wireguard_send.c
@@ -16,7 +16,6 @@
 
 #include <vnet/vnet.h>
 #include <vnet/ip/ip6_link.h>
-#include <vnet/udp/udp.h>
 #include <vppinfra/error.h>
 #include <vlibmemory/api.h>
 #include <wireguard/wireguard.h>

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 4dd3f05..366e60e 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -30,6 +30,7 @@
 #include <vnet/vxlan/vxlan.h>
 #include <vnet/gre/gre.h>
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
+#include <vnet/udp/udp_local.h>
 
 #include <vpp/api/vpe_msg_enum.h>
 #include <vnet/l2/l2_classify.h>

diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index dc8c0de..f8b034f 100644 (file)
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -672,6 +672,8 @@ list(APPEND VNET_HEADERS
   udp/udp_error.def
   udp/udp.h
   udp/udp_packet.h
+  udp/udp_inlines.h
+  udp/udp_local.h
 )
 
 list(APPEND VNET_API_FILES udp/udp.api)

diff --git a/src/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c
index 0edf8a8..2bb4c1d 100644 (file)
--- a/src/vnet/bfd/bfd_udp.c
+++ b/src/vnet/bfd/bfd_udp.c
@@ -22,8 +22,8 @@
 #include <vlib/buffer.h>
 #include <vnet/ip/format.h>
 #include <vnet/ethernet/packet.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/udp/udp_packet.h>
-#include <vnet/udp/udp.h>
 #include <vnet/ip/lookup.h>
 #include <vnet/ip/icmp46_packet.h>
 #include <vnet/ip/ip4.h>

diff --git a/src/vnet/bier/bier_bift_table.c b/src/vnet/bier/bier_bift_table.c
index f226779..6de4f97 100644 (file)
--- a/src/vnet/bier/bier_bift_table.c
+++ b/src/vnet/bier/bier_bift_table.c
@@ -15,7 +15,7 @@
 
 #include <vnet/bier/bier_bift_table.h>
 #include <vnet/dpo/drop_dpo.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 
 typedef enum {
 #define bier_error(n,s) BIER_INPUT_ERROR_##n,

diff --git a/src/vnet/flow/flow_api.c b/src/vnet/flow/flow_api.c
index 9ae3802..b24c851 100644 (file)
--- a/src/vnet/flow/flow_api.c
+++ b/src/vnet/flow/flow_api.c
@@ -25,6 +25,7 @@
 #include <vnet/api_errno.h>
 #include <vnet/flow/flow.h>
 #include <vnet/fib/fib_table.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/tunnel/tunnel_types_api.h>
 #include <vnet/ip/ip_types_api.h>
 #include <vnet/vnet_msg_enum.h>
@@ -251,6 +252,7 @@ out:
   ({
     rmp->flow_index = ntohl (flow_index);
   }));
+  /* *INDENT-ON* */
 }
 
 static void
@@ -259,8 +261,8 @@ vl_api_flow_del_t_handler (vl_api_flow_del_t * mp)
   vl_api_flow_add_reply_t *rmp;
   int rv = 0;
 
-  vnet_main_t *vnm = vnet_get_main();
-  rv = vnet_flow_del(vnm, ntohl(mp->flow_index));
+  vnet_main_t *vnm = vnet_get_main ();
+  rv = vnet_flow_del (vnm, ntohl (mp->flow_index));
 
   REPLY_MACRO (VL_API_FLOW_DEL_REPLY);
 }
@@ -271,8 +273,9 @@ vl_api_flow_enable_t_handler (vl_api_flow_enable_t * mp)
   vl_api_flow_add_reply_t *rmp;
   int rv = 0;
 
-  vnet_main_t *vnm = vnet_get_main();
-  rv = vnet_flow_enable(vnm, ntohl(mp->flow_index), ntohl(mp->hw_if_index));
+  vnet_main_t *vnm = vnet_get_main ();
+  rv =
+    vnet_flow_enable (vnm, ntohl (mp->flow_index), ntohl (mp->hw_if_index));
 
   REPLY_MACRO (VL_API_FLOW_ENABLE_REPLY);
 }
@@ -283,8 +286,9 @@ vl_api_flow_disable_t_handler (vl_api_flow_disable_t * mp)
   vl_api_flow_add_reply_t *rmp;
   int rv = 0;
 
-  vnet_main_t *vnm = vnet_get_main();
-  rv = vnet_flow_disable(vnm, ntohl(mp->flow_index), ntohl(mp->hw_if_index));
+  vnet_main_t *vnm = vnet_get_main ();
+  rv =
+    vnet_flow_disable (vnm, ntohl (mp->flow_index), ntohl (mp->hw_if_index));
 
   REPLY_MACRO (VL_API_FLOW_DISABLE_REPLY);
 }

diff --git a/src/vnet/gso/gro_func.h b/src/vnet/gso/gro_func.h
index 95def6f..96a03ce 100644 (file)
--- a/src/vnet/gso/gro_func.h
+++ b/src/vnet/gso/gro_func.h
@@ -19,6 +19,8 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/gso/gro.h>
 #include <vnet/gso/hdr_offset_parser.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip6.h>
 #include <vnet/udp/udp_packet.h>
 #include <vnet/tcp/tcp.h>
 #include <vnet/vnet.h>

diff --git a/src/vnet/gso/hdr_offset_parser.h b/src/vnet/gso/hdr_offset_parser.h
index bfe0421..e846aaa 100644 (file)
--- a/src/vnet/gso/hdr_offset_parser.h
+++ b/src/vnet/gso/hdr_offset_parser.h
@@ -19,7 +19,7 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/udp/udp_packet.h>
 #include <vnet/vnet.h>
 #include <vnet/vxlan/vxlan_packet.h>

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 913bac6..52c07ac 100644 (file)
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -40,6 +40,7 @@
 #include <vnet/vnet.h>
 #include <vnet/ip/icmp46_packet.h>
 #include <vnet/ethernet/packet.h>
+#include <vnet/ip/format.h>
 #include <vnet/ip/ip4.h>
 #include <vnet/ip/ip6.h>
 #include <vnet/udp/udp_packet.h>

diff --git a/src/vnet/ip/punt_node.c b/src/vnet/ip/punt_node.c
index 87b1452..23c4cc4 100644 (file)
--- a/src/vnet/ip/punt_node.c
+++ b/src/vnet/ip/punt_node.c
@@ -24,8 +24,6 @@
 
 #include <vnet/ip/ip.h>
 #include <vlib/vlib.h>
-#include <vnet/udp/udp.h>
-#include <vnet/tcp/tcp.h>
 #include <vnet/ip/punt.h>
 #include <vlib/unix/unix.h>
 

diff --git a/src/vnet/ipfix-export/flow_api.c b/src/vnet/ipfix-export/flow_api.c
index 217cf31..226db26 100644 (file)
--- a/src/vnet/ipfix-export/flow_api.c
+++ b/src/vnet/ipfix-export/flow_api.c
@@ -20,6 +20,7 @@
 #include <vnet/vnet.h>
 #include <vlibmemory/api.h>
 #include <vnet/ip/ip_types_api.h>
+#include <vnet/udp/udp_local.h>
 
 #include <vnet/interface.h>
 #include <vnet/api_errno.h>

diff --git a/src/vnet/ipfix-export/flow_report.c b/src/vnet/ipfix-export/flow_report.c
index 56a2d16..a831c3c 100644 (file)
--- a/src/vnet/ipfix-export/flow_report.c
+++ b/src/vnet/ipfix-export/flow_report.c
@@ -17,6 +17,7 @@
  */
 #include <vnet/ipfix-export/flow_report.h>
 #include <vnet/api_errno.h>
+#include <vnet/udp/udp.h>
 
 flow_report_main_t flow_report_main;
 

diff --git a/src/vnet/ipfix-export/flow_report.h b/src/vnet/ipfix-export/flow_report.h
index a26232d..30c1176 100644 (file)
--- a/src/vnet/ipfix-export/flow_report.h
+++ b/src/vnet/ipfix-export/flow_report.h
@@ -23,7 +23,7 @@
 #include <vnet/ip/ip_packet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 #include <vlib/cli.h>
 #include <vppinfra/error.h>
 #include <vppinfra/hash.h>

diff --git a/src/vnet/ipfix-export/flow_report_classify.c b/src/vnet/ipfix-export/flow_report_classify.c
index 58f623d..21b6411 100644 (file)
--- a/src/vnet/ipfix-export/flow_report_classify.c
+++ b/src/vnet/ipfix-export/flow_report_classify.c
@@ -16,6 +16,8 @@
 #include <vnet/ipfix-export/flow_report_classify.h>
 #include <vnet/api_errno.h>
 #include <vnet/classify/vnet_classify.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/udp/udp_local.h>
 
 /* Common prefix of tcp and udp headers
  * containing only source and destination port fields */

diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index 591ec26..9a1c0f1 100644 (file)
--- a/src/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -18,7 +18,6 @@
 #include <vnet/vnet.h>
 #include <vnet/api_errno.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
 
 #include <vnet/crypto/crypto.h>
 

diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c
index 55f69f5..a2de1e7 100644 (file)
--- a/src/vnet/ipsec/ipsec.c
+++ b/src/vnet/ipsec/ipsec.c
@@ -19,7 +19,7 @@
 #include <vnet/api_errno.h>
 #include <vnet/ip/ip.h>
 #include <vnet/interface.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/esp.h>

diff --git a/src/vnet/ipsec/ipsec_sa.c b/src/vnet/ipsec/ipsec_sa.c
index 2ff3bee..9b2f2b5 100644 (file)
--- a/src/vnet/ipsec/ipsec_sa.c
+++ b/src/vnet/ipsec/ipsec_sa.c
@@ -15,7 +15,7 @@
 
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/esp.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/fib/fib_entry_track.h>
 #include <vnet/ipsec/ipsec_tun.h>

diff --git a/src/vnet/ipsec/ipsec_tun.c b/src/vnet/ipsec/ipsec_tun.c
index 4a84201..4985c54 100644 (file)
--- a/src/vnet/ipsec/ipsec_tun.c
+++ b/src/vnet/ipsec/ipsec_tun.c
@@ -18,7 +18,7 @@
 #include <vnet/ipsec/ipsec_tun.h>
 #include <vnet/ipsec/ipsec_itf.h>
 #include <vnet/ipsec/esp.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/adj/adj_delegate.h>
 #include <vnet/adj/adj_midchain.h>
 #include <vnet/teib/teib.h>

diff --git a/src/vnet/udp/udp.h b/src/vnet/udp/udp.h
index 8a0575f..8f4b2f1 100644 (file)
--- a/src/vnet/udp/udp.h
+++ b/src/vnet/udp/udp.h
@@ -16,6 +16,8 @@
 #define __included_udp_h__
 
 #include <vnet/vnet.h>
+#include <vnet/udp/udp_inlines.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/udp/udp_packet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ip/ip4.h>
@@ -65,57 +67,6 @@ typedef struct
   u16 mss;                             /**< connection mss */
 } udp_connection_t;
 
-#define foreach_udp4_dst_port                  \
-_ (53, dns)                                    \
-_ (67, dhcp_to_server)                          \
-_ (68, dhcp_to_client)                          \
-_ (500, ikev2)                                  \
-_ (2152, GTPU)                                 \
-_ (3784, bfd4)                                  \
-_ (3785, bfd_echo4)                             \
-_ (4341, lisp_gpe)                              \
-_ (4342, lisp_cp)                              \
-_ (4500, ipsec)                                 \
-_ (4739, ipfix)                                 \
-_ (4789, vxlan)                                        \
-_ (4789, vxlan6)                               \
-_ (48879, vxlan_gbp)                           \
-_ (4790, VXLAN_GPE)                            \
-_ (6633, vpath_3)                              \
-_ (6081, geneve)                               \
-_ (53053, dns_reply)
-
-
-#define foreach_udp6_dst_port                   \
-_ (53, dns6)                                   \
-_ (547, dhcpv6_to_server)                       \
-_ (546, dhcpv6_to_client)                      \
-_ (2152, GTPU6)                                        \
-_ (3784, bfd6)                                  \
-_ (3785, bfd_echo6)                             \
-_ (4341, lisp_gpe6)                             \
-_ (4342, lisp_cp6)                             \
-_ (48879, vxlan6_gbp)                          \
-_ (4790, VXLAN6_GPE)                            \
-_ (6633, vpath6_3)                             \
-_ (6081, geneve6)                              \
-_ (8138, BIER)                                 \
-_ (53053, dns_reply6)
-
-typedef enum
-{
-#define _(n,f) UDP_DST_PORT_##f = n,
-  foreach_udp4_dst_port foreach_udp6_dst_port
-#undef _
-} udp_dst_port_t;
-
-typedef enum
-{
-#define _(n,f) UDP6_DST_PORT_##f = n,
-  foreach_udp6_dst_port
-#undef _
-} udp6_dst_port_t;
-
 typedef struct
 {
   /* Name (a c string). */
@@ -180,6 +131,9 @@ extern vlib_node_registration_t udp6_input_node;
 extern vlib_node_registration_t udp4_local_node;
 extern vlib_node_registration_t udp6_local_node;
 
+void udp_add_dst_port (udp_main_t * um, udp_dst_port_t dst_port,
+                      char *dst_port_name, u8 is_ip4);
+
 always_inline udp_connection_t *
 udp_connection_get (u32 conn_index, u32 thread_index)
 {
@@ -282,217 +236,10 @@ format_function_t format_udp_connection;
 unformat_function_t unformat_udp_header;
 unformat_function_t unformat_udp_port;
 
-void udp_add_dst_port (udp_main_t * um, udp_dst_port_t dst_port,
-                      char *dst_port_name, u8 is_ip4);
-void udp_register_dst_port (vlib_main_t * vm,
-                           udp_dst_port_t dst_port,
-                           u32 node_index, u8 is_ip4);
-void udp_unregister_dst_port (vlib_main_t * vm,
-                             udp_dst_port_t dst_port, u8 is_ip4);
-bool udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4);
 void udp_connection_share_port (u16 lcl_port, u8 is_ip4);
 
 void udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add);
 
-always_inline void *
-vlib_buffer_push_udp (vlib_buffer_t * b, u16 sp, u16 dp, u8 offload_csum)
-{
-  udp_header_t *uh;
-  u16 udp_len = sizeof (udp_header_t) + b->current_length;
-  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID))
-    udp_len += b->total_length_not_including_first_buffer;
-
-  uh = vlib_buffer_push_uninit (b, sizeof (udp_header_t));
-  uh->src_port = sp;
-  uh->dst_port = dp;
-  uh->checksum = 0;
-  uh->length = clib_host_to_net_u16 (udp_len);
-  if (offload_csum)
-    b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
-  vnet_buffer (b)->l4_hdr_offset = (u8 *) uh - b->data;
-  b->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID;
-  return uh;
-}
-
-always_inline void
-ip_udp_fixup_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 is_ip4)
-{
-  u16 new_l0;
-  udp_header_t *udp0;
-
-  if (is_ip4)
-    {
-      ip4_header_t *ip0;
-      ip_csum_t sum0;
-      u16 old_l0 = 0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* fix the <bleep>ing outer-IP checksum */
-      sum0 = ip0->checksum;
-      /* old_l0 always 0, see the rewrite setup */
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-
-      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-                            length /* changed member */ );
-      ip0->checksum = ip_csum_fold (sum0);
-      ip0->length = new_l0;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-                                    - sizeof (*ip0));
-      udp0->length = new_l0;
-    }
-  else
-    {
-      ip6_header_t *ip0;
-      int bogus0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-                                    - sizeof (*ip0));
-      ip0->payload_length = new_l0;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      udp0->length = new_l0;
-
-      udp0->checksum =
-       ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
-      ASSERT (bogus0 == 0);
-
-      if (udp0->checksum == 0)
-       udp0->checksum = 0xffff;
-    }
-}
-
-always_inline void
-ip_udp_encap_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 * ec0, word ec_len,
-                 u8 is_ip4)
-{
-  vlib_buffer_advance (b0, -ec_len);
-
-  if (is_ip4)
-    {
-      ip4_header_t *ip0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* Apply the encap string. */
-      clib_memcpy_fast (ip0, ec0, ec_len);
-      ip_udp_fixup_one (vm, b0, 1);
-    }
-  else
-    {
-      ip6_header_t *ip0;
-
-      ip0 = vlib_buffer_get_current (b0);
-
-      /* Apply the encap string. */
-      clib_memcpy_fast (ip0, ec0, ec_len);
-      ip_udp_fixup_one (vm, b0, 0);
-    }
-}
-
-always_inline void
-ip_udp_encap_two (vlib_main_t * vm, vlib_buffer_t * b0, vlib_buffer_t * b1,
-                 u8 * ec0, u8 * ec1, word ec_len, u8 is_v4)
-{
-  u16 new_l0, new_l1;
-  udp_header_t *udp0, *udp1;
-
-  ASSERT (_vec_len (ec0) == _vec_len (ec1));
-
-  vlib_buffer_advance (b0, -ec_len);
-  vlib_buffer_advance (b1, -ec_len);
-
-  if (is_v4)
-    {
-      ip4_header_t *ip0, *ip1;
-      ip_csum_t sum0, sum1;
-      u16 old_l0 = 0, old_l1 = 0;
-
-      ip0 = vlib_buffer_get_current (b0);
-      ip1 = vlib_buffer_get_current (b1);
-
-      /* Apply the encap string */
-      clib_memcpy_fast (ip0, ec0, ec_len);
-      clib_memcpy_fast (ip1, ec1, ec_len);
-
-      /* fix the <bleep>ing outer-IP checksum */
-      sum0 = ip0->checksum;
-      sum1 = ip1->checksum;
-
-      /* old_l0 always 0, see the rewrite setup */
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
-
-      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
-                            length /* changed member */ );
-      sum1 = ip_csum_update (sum1, old_l1, new_l1, ip4_header_t,
-                            length /* changed member */ );
-
-      ip0->checksum = ip_csum_fold (sum0);
-      ip1->checksum = ip_csum_fold (sum1);
-
-      ip0->length = new_l0;
-      ip1->length = new_l1;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      udp1 = (udp_header_t *) (ip1 + 1);
-
-      new_l0 =
-       clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
-                             sizeof (*ip0));
-      new_l1 =
-       clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1) -
-                             sizeof (*ip1));
-      udp0->length = new_l0;
-      udp1->length = new_l1;
-    }
-  else
-    {
-      ip6_header_t *ip0, *ip1;
-      int bogus0, bogus1;
-
-      ip0 = vlib_buffer_get_current (b0);
-      ip1 = vlib_buffer_get_current (b1);
-
-      /* Apply the encap string. */
-      clib_memcpy_fast (ip0, ec0, ec_len);
-      clib_memcpy_fast (ip1, ec1, ec_len);
-
-      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
-                                    - sizeof (*ip0));
-      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1)
-                                    - sizeof (*ip1));
-      ip0->payload_length = new_l0;
-      ip1->payload_length = new_l1;
-
-      /* Fix UDP length */
-      udp0 = (udp_header_t *) (ip0 + 1);
-      udp1 = (udp_header_t *) (ip1 + 1);
-
-      udp0->length = new_l0;
-      udp1->length = new_l1;
-
-      udp0->checksum =
-       ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
-      udp1->checksum =
-       ip6_tcp_udp_icmp_compute_checksum (vm, b1, ip1, &bogus1);
-      ASSERT (bogus0 == 0);
-      ASSERT (bogus1 == 0);
-
-      if (udp0->checksum == 0)
-       udp0->checksum = 0xffff;
-      if (udp1->checksum == 0)
-       udp1->checksum = 0xffff;
-    }
-}
-
 /*
  * fd.io coding-style-patch-verification: ON
  *

diff --git a/src/vnet/udp/udp_encap.h b/src/vnet/udp/udp_encap.h
index 9d82e59..b096e0f 100644 (file)
--- a/src/vnet/udp/udp_encap.h
+++ b/src/vnet/udp/udp_encap.h
@@ -17,7 +17,7 @@
 #define __UDP_ENCAP_H__
 
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/fib/fib_node.h>
 
 /**

diff --git a/src/vnet/udp/udp_encap_node.c b/src/vnet/udp/udp_encap_node.c
index e8e3794..5b9fc0b 100644 (file)
--- a/src/vnet/udp/udp_encap_node.c
+++ b/src/vnet/udp/udp_encap_node.c
@@ -14,6 +14,7 @@
  */
 
 #include <vnet/udp/udp_encap.h>
+#include <vnet/udp/udp.h>
 
 typedef struct udp4_encap_trace_t_
 {

diff --git a/src/vnet/udp/udp_inlines.h b/src/vnet/udp/udp_inlines.h
new file mode 100644 (file)
index 0000000..ec800f9
--- /dev/null
+++ b/src/vnet/udp/udp_inlines.h
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 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:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_VNET_UDP_UDP_INLINES_H_
+#define SRC_VNET_UDP_UDP_INLINES_H_
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip6.h>
+#include <vnet/udp/udp_packet.h>
+
+always_inline void *
+vlib_buffer_push_udp (vlib_buffer_t * b, u16 sp, u16 dp, u8 offload_csum)
+{
+  udp_header_t *uh;
+  u16 udp_len = sizeof (udp_header_t) + b->current_length;
+  if (PREDICT_FALSE (b->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID))
+    udp_len += b->total_length_not_including_first_buffer;
+
+  uh = vlib_buffer_push_uninit (b, sizeof (udp_header_t));
+  uh->src_port = sp;
+  uh->dst_port = dp;
+  uh->checksum = 0;
+  uh->length = clib_host_to_net_u16 (udp_len);
+  if (offload_csum)
+    b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
+  vnet_buffer (b)->l4_hdr_offset = (u8 *) uh - b->data;
+  b->flags |= VNET_BUFFER_F_L4_HDR_OFFSET_VALID;
+  return uh;
+}
+
+always_inline void
+ip_udp_fixup_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 is_ip4)
+{
+  u16 new_l0;
+  udp_header_t *udp0;
+
+  if (is_ip4)
+    {
+      ip4_header_t *ip0;
+      ip_csum_t sum0;
+      u16 old_l0 = 0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* fix the <bleep>ing outer-IP checksum */
+      sum0 = ip0->checksum;
+      /* old_l0 always 0, see the rewrite setup */
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+
+      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+                            length /* changed member */ );
+      ip0->checksum = ip_csum_fold (sum0);
+      ip0->length = new_l0;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+                                    - sizeof (*ip0));
+      udp0->length = new_l0;
+    }
+  else
+    {
+      ip6_header_t *ip0;
+      int bogus0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+                                    - sizeof (*ip0));
+      ip0->payload_length = new_l0;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      udp0->length = new_l0;
+
+      udp0->checksum =
+       ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
+      ASSERT (bogus0 == 0);
+
+      if (udp0->checksum == 0)
+       udp0->checksum = 0xffff;
+    }
+}
+
+always_inline void
+ip_udp_encap_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 * ec0, word ec_len,
+                 u8 is_ip4)
+{
+  vlib_buffer_advance (b0, -ec_len);
+
+  if (is_ip4)
+    {
+      ip4_header_t *ip0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* Apply the encap string. */
+      clib_memcpy_fast (ip0, ec0, ec_len);
+      ip_udp_fixup_one (vm, b0, 1);
+    }
+  else
+    {
+      ip6_header_t *ip0;
+
+      ip0 = vlib_buffer_get_current (b0);
+
+      /* Apply the encap string. */
+      clib_memcpy_fast (ip0, ec0, ec_len);
+      ip_udp_fixup_one (vm, b0, 0);
+    }
+}
+
+always_inline void
+ip_udp_encap_two (vlib_main_t * vm, vlib_buffer_t * b0, vlib_buffer_t * b1,
+                 u8 * ec0, u8 * ec1, word ec_len, u8 is_v4)
+{
+  u16 new_l0, new_l1;
+  udp_header_t *udp0, *udp1;
+
+  ASSERT (_vec_len (ec0) == _vec_len (ec1));
+
+  vlib_buffer_advance (b0, -ec_len);
+  vlib_buffer_advance (b1, -ec_len);
+
+  if (is_v4)
+    {
+      ip4_header_t *ip0, *ip1;
+      ip_csum_t sum0, sum1;
+      u16 old_l0 = 0, old_l1 = 0;
+
+      ip0 = vlib_buffer_get_current (b0);
+      ip1 = vlib_buffer_get_current (b1);
+
+      /* Apply the encap string */
+      clib_memcpy_fast (ip0, ec0, ec_len);
+      clib_memcpy_fast (ip1, ec1, ec_len);
+
+      /* fix the <bleep>ing outer-IP checksum */
+      sum0 = ip0->checksum;
+      sum1 = ip1->checksum;
+
+      /* old_l0 always 0, see the rewrite setup */
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1));
+
+      sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+                            length /* changed member */ );
+      sum1 = ip_csum_update (sum1, old_l1, new_l1, ip4_header_t,
+                            length /* changed member */ );
+
+      ip0->checksum = ip_csum_fold (sum0);
+      ip1->checksum = ip_csum_fold (sum1);
+
+      ip0->length = new_l0;
+      ip1->length = new_l1;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      udp1 = (udp_header_t *) (ip1 + 1);
+
+      new_l0 =
+       clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
+                             sizeof (*ip0));
+      new_l1 =
+       clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1) -
+                             sizeof (*ip1));
+      udp0->length = new_l0;
+      udp1->length = new_l1;
+    }
+  else
+    {
+      ip6_header_t *ip0, *ip1;
+      int bogus0, bogus1;
+
+      ip0 = vlib_buffer_get_current (b0);
+      ip1 = vlib_buffer_get_current (b1);
+
+      /* Apply the encap string. */
+      clib_memcpy_fast (ip0, ec0, ec_len);
+      clib_memcpy_fast (ip1, ec1, ec_len);
+
+      new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
+                                    - sizeof (*ip0));
+      new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b1)
+                                    - sizeof (*ip1));
+      ip0->payload_length = new_l0;
+      ip1->payload_length = new_l1;
+
+      /* Fix UDP length */
+      udp0 = (udp_header_t *) (ip0 + 1);
+      udp1 = (udp_header_t *) (ip1 + 1);
+
+      udp0->length = new_l0;
+      udp1->length = new_l1;
+
+      udp0->checksum =
+       ip6_tcp_udp_icmp_compute_checksum (vm, b0, ip0, &bogus0);
+      udp1->checksum =
+       ip6_tcp_udp_icmp_compute_checksum (vm, b1, ip1, &bogus1);
+      ASSERT (bogus0 == 0);
+      ASSERT (bogus1 == 0);
+
+      if (udp0->checksum == 0)
+       udp0->checksum = 0xffff;
+      if (udp1->checksum == 0)
+       udp1->checksum = 0xffff;
+    }
+}
+
+#endif /* SRC_VNET_UDP_UDP_INLINES_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */

diff --git a/src/vnet/udp/udp_local.c b/src/vnet/udp/udp_local.c
index 8efcda1..61aafaf 100644 (file)
--- a/src/vnet/udp/udp_local.c
+++ b/src/vnet/udp/udp_local.c
@@ -525,7 +525,7 @@ udp_unregister_dst_port (vlib_main_t * vm, udp_dst_port_t dst_port, u8 is_ip4)
   n[0] = UDP_NO_NODE_SET;
 }
 
-bool
+u8
 udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4)
 {
   udp_main_t *um = &udp_main;

diff --git a/src/vnet/udp/udp_local.h b/src/vnet/udp/udp_local.h
new file mode 100644 (file)
index 0000000..1628682
--- /dev/null
+++ b/src/vnet/udp/udp_local.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 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:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SRC_VNET_UDP_UDP_LOCAL_H_
+#define SRC_VNET_UDP_UDP_LOCAL_H_
+
+#include <vnet/vnet.h>
+
+#define foreach_udp4_dst_port                  \
+_ (53, dns)                                    \
+_ (67, dhcp_to_server)                          \
+_ (68, dhcp_to_client)                          \
+_ (500, ikev2)                                  \
+_ (2152, GTPU)                                 \
+_ (3784, bfd4)                                  \
+_ (3785, bfd_echo4)                             \
+_ (4341, lisp_gpe)                              \
+_ (4342, lisp_cp)                              \
+_ (4500, ipsec)                                 \
+_ (4739, ipfix)                                 \
+_ (4789, vxlan)                                        \
+_ (4789, vxlan6)                               \
+_ (48879, vxlan_gbp)                           \
+_ (4790, VXLAN_GPE)                            \
+_ (6633, vpath_3)                              \
+_ (6081, geneve)                               \
+_ (53053, dns_reply)
+
+
+#define foreach_udp6_dst_port                   \
+_ (53, dns6)                                   \
+_ (547, dhcpv6_to_server)                       \
+_ (546, dhcpv6_to_client)                      \
+_ (2152, GTPU6)                                        \
+_ (3784, bfd6)                                  \
+_ (3785, bfd_echo6)                             \
+_ (4341, lisp_gpe6)                             \
+_ (4342, lisp_cp6)                             \
+_ (48879, vxlan6_gbp)                          \
+_ (4790, VXLAN6_GPE)                            \
+_ (6633, vpath6_3)                             \
+_ (6081, geneve6)                              \
+_ (8138, BIER)                                 \
+_ (53053, dns_reply6)
+
+typedef enum
+{
+#define _(n,f) UDP_DST_PORT_##f = n,
+  foreach_udp4_dst_port foreach_udp6_dst_port
+#undef _
+} udp_dst_port_t;
+
+typedef enum
+{
+#define _(n,f) UDP6_DST_PORT_##f = n,
+  foreach_udp6_dst_port
+#undef _
+} udp6_dst_port_t;
+
+void udp_register_dst_port (vlib_main_t * vm,
+                           udp_dst_port_t dst_port,
+                           u32 node_index, u8 is_ip4);
+void udp_unregister_dst_port (vlib_main_t * vm,
+                             udp_dst_port_t dst_port, u8 is_ip4);
+u8 udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4);
+
+#endif /* SRC_VNET_UDP_UDP_LOCAL_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */

diff --git a/src/vnet/udp/udp_packet.h b/src/vnet/udp/udp_packet.h
index 110bf61..edb5366 100644 (file)
--- a/src/vnet/udp/udp_packet.h
+++ b/src/vnet/udp/udp_packet.h
@@ -40,6 +40,8 @@
 #ifndef included_udp_packet_h
 #define included_udp_packet_h
 
+#include <vppinfra/clib.h>
+
 typedef struct
 {
   /* Source and destination port. */

diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.h b/src/vnet/vxlan-gbp/vxlan_gbp.h
index c422d54..fe93587 100644 (file)
--- a/src/vnet/vxlan-gbp/vxlan_gbp.h
+++ b/src/vnet/vxlan-gbp/vxlan_gbp.h
@@ -28,7 +28,8 @@
 #include <vnet/vxlan-gbp/vxlan_gbp_packet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/dpo/dpo.h>
 #include <vnet/adj/adj_types.h>
 

diff --git a/src/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c
index 173286d..aea793b 100644 (file)
--- a/src/vnet/vxlan-gpe/decap.c
+++ b/src/vnet/vxlan-gpe/decap.c
@@ -21,6 +21,7 @@
 */
 
 #include <vlib/vlib.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 
 /**

diff --git a/src/vnet/vxlan-gpe/encap.c b/src/vnet/vxlan-gpe/encap.c
index 1cca415..daa0381 100644 (file)
--- a/src/vnet/vxlan-gpe/encap.c
+++ b/src/vnet/vxlan-gpe/encap.c
@@ -22,6 +22,7 @@
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/udp/udp_inlines.h>
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 
 /** Statistics (not really errors) */

diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
index 3ce8ad6..979d98c 100644 (file)
--- a/src/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
@@ -26,6 +26,7 @@
 #include <vnet/mfib/mfib_table.h>
 #include <vnet/adj/adj_mcast.h>
 #include <vnet/interface.h>
+#include <vnet/udp/udp_local.h>
 #include <vlib/vlib.h>
 
 /**

diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h
index a50be39..e246827 100644 (file)
--- a/src/vnet/vxlan-gpe/vxlan_gpe.h
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.h
@@ -32,7 +32,7 @@
 #include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/dpo/dpo.h>
 #include <vnet/adj/adj_types.h>
 

diff --git a/src/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c
index e0da9e7..e838c03 100644 (file)
--- a/src/vnet/vxlan/decap.c
+++ b/src/vnet/vxlan/decap.c
@@ -17,6 +17,7 @@
 
 #include <vlib/vlib.h>
 #include <vnet/vxlan/vxlan.h>
+#include <vnet/udp/udp_local.h>
 
 #ifndef CLIB_MARCH_VARIANT
 vlib_node_registration_t vxlan4_input_node;

diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index b1e4aaf..742103a 100644 (file)
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -22,6 +22,7 @@
 #include <vnet/adj/rewrite.h>
 #include <vnet/interface.h>
 #include <vnet/flow/flow.h>
+#include <vnet/udp/udp_local.h>
 #include <vlib/vlib.h>
 
 /**

diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h
index 772c9d7..1c77d77 100644 (file)
--- a/src/vnet/vxlan/vxlan.h
+++ b/src/vnet/vxlan/vxlan.h
@@ -29,7 +29,7 @@
 #include <vnet/vxlan/vxlan_packet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_packet.h>
 #include <vnet/dpo/dpo.h>
 #include <vnet/adj/adj_types.h>