From b040f98a88954ccf2e63fd7b2676865a2dbe0078 Mon Sep 17 00:00:00 2001
From: Florin Coras <fcoras@cisco.com>
Date: Tue, 20 Oct 2020 14:59:43 -0700
Subject: misc: minimize dependencies on udp.h

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Id13f33843b230a1d169560742c4f7b2dc17d8718
---
 src/plugins/ioam/analyse/ioam_summary_export.c   | 1 +
 src/plugins/ioam/export-common/ioam_export.h     | 3 ++-
 src/plugins/ioam/ipfixcollector/ipfixcollector.c | 2 +-
 src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c    | 2 +-
 src/plugins/ioam/udp-ping/udp_ping_export.c      | 2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/plugins/ioam')

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
-- 
cgit 1.2.3-korg