diff options
Diffstat (limited to 'src/plugins')
33 files changed, 36 insertions, 26 deletions
diff --git a/src/plugins/cnat/cnat_session.h b/src/plugins/cnat/cnat_session.h index 83b8cd61389..a1f3486417d 100644 --- 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 e42ec3f472c..f8a96f151e3 100644 --- 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 31b89850802..598bd16cf8d 100644 --- 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 4810ae5bae4..3466f0c1291 100644 --- 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 bdf14961a78..045f4d616a3 100644 --- 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 d6a55ecfc25..8becb820ff1 100644 --- 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 18e0d06c993..9bc12c8b60c 100644 --- 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 0ec1d27a6bd..a9768303cd9 100644 --- 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 029f7534497..d41a49a7ff6 100644 --- 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 07616419070..8f3b654bcc8 100644 --- 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 ad9ae609adb..a2d5ad2c77d 100644 --- 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 7f4fac58d4a..a9ab1bc8067 100644 --- 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 12907d8c54b..032272f5ec7 100644 --- 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 b1bca9bf91f..f242ad7a788 100644 --- 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 37b828cb786..d4f57c50101 100644 --- 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 7567f31caf2..215f14b74bc 100644 --- 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 3c632c86900..3e835989a6f 100644 --- 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 ab5e808ddab..21a14844f5e 100644 --- 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 0d5f689fe7b..1d2abaf3f90 100644 --- 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 aa2e7d1bfbf..10dc4fe7aa7 100644 --- 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 eab10f4d2d5..d93f3abaad2 100644 --- 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 5f67f9b7ccd..ff463ef928f 100644 --- 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 f52026b1f11..f0bb0f9aae7 100644 --- 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 107944915cd..fe1f7dd27bc 100644 --- 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 e4fc0cedf19..7226fb72086 100644 --- 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 108edf0bdd1..5c5554ba36e 100644 --- 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 11b4ba82a17..ddfa3e49183 100644 --- 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 99a4bb41c3a..dc1d0876d55 100644 --- 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 e9fbc595f04..703c854834c 100644 --- 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 b69cd745e9b..876e00324e3 100644 --- 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 c2c07e7a647..d908e534be7 100644 --- 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 9510a0ad385..f74a128aa38 100755 --- 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 e520e92bc42..f492e05c175 100755 --- 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> |