From e4031131ccddd7c4eb683b36f1a97a65dcff008a Mon Sep 17 00:00:00 2001
From: Neale Ranns <neale.ranns@cisco.com>
Date: Mon, 26 Oct 2020 13:00:06 +0000
Subject: misc: Break the big IP header files to improve compile time

Type: refactor

Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Change-Id: Id1801519638a9b97175847d7ed58824fb83433d6
---
 src/plugins/cnat/cnat_node_vip.c                     | 3 +++
 src/plugins/cnat/cnat_types.h                        | 1 +
 src/plugins/gbp/gbp_itf.c                            | 2 ++
 src/plugins/gbp/gbp_itf.h                            | 1 +
 src/plugins/gbp/gbp_learn.h                          | 2 ++
 src/plugins/ioam/ip6/ioam_cache_node.c               | 1 +
 src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c | 1 +
 src/plugins/l2e/l2e.c                                | 1 +
 src/plugins/lisp/lisp-cp/lisp_cp_test.c              | 1 +
 src/plugins/lisp/lisp-cp/one_test.c                  | 1 +
 src/plugins/lisp/lisp-cp/packets.c                   | 2 ++
 src/plugins/lisp/lisp-gpe/lisp_gpe_test.c            | 1 +
 src/plugins/nat/nat.c                                | 1 +
 13 files changed, 18 insertions(+)

(limited to 'src/plugins')

diff --git a/src/plugins/cnat/cnat_node_vip.c b/src/plugins/cnat/cnat_node_vip.c
index 5c1e0e44abe..bbce5f3bd15 100644
--- a/src/plugins/cnat/cnat_node_vip.c
+++ b/src/plugins/cnat/cnat_node_vip.c
@@ -22,6 +22,9 @@
 #include <vnet/dpo/load_balance.h>
 #include <vnet/dpo/load_balance_map.h>
 
+#include <vnet/ip/ip4_inlines.h>
+#include <vnet/ip/ip6_inlines.h>
+
 typedef struct cnat_translation_trace_t_
 {
   cnat_session_t session;
diff --git a/src/plugins/cnat/cnat_types.h b/src/plugins/cnat/cnat_types.h
index 16d985f03a8..b1b5b2d2336 100644
--- a/src/plugins/cnat/cnat_types.h
+++ b/src/plugins/cnat/cnat_types.h
@@ -21,6 +21,7 @@
 #include <vnet/fib/fib_source.h>
 #include <vnet/ip/ip_types.h>
 #include <vnet/ip/ip.h>
+#include <vnet/util/throttle.h>
 
 /* only in the default table for v4 and v6 */
 #define CNAT_FIB_TABLE 0
diff --git a/src/plugins/gbp/gbp_itf.c b/src/plugins/gbp/gbp_itf.c
index a9e9225ae72..6a4a19733df 100644
--- a/src/plugins/gbp/gbp_itf.c
+++ b/src/plugins/gbp/gbp_itf.c
@@ -17,6 +17,8 @@
 #include <plugins/gbp/gbp_bridge_domain.h>
 #include <plugins/gbp/gbp_route_domain.h>
 
+#include <vnet/ip/ip.h>
+
 #define foreach_gbp_itf_mode  \
   _(L2, "l2")                 \
   _(L3, "L3")
diff --git a/src/plugins/gbp/gbp_itf.h b/src/plugins/gbp/gbp_itf.h
index b0c7ed91865..23a09b2a9ff 100644
--- a/src/plugins/gbp/gbp_itf.h
+++ b/src/plugins/gbp/gbp_itf.h
@@ -18,6 +18,7 @@
 
 #include <vnet/l2/l2_input.h>
 #include <vnet/l2/l2_output.h>
+#include <vnet/dpo/dpo.h>
 
 
 #define foreach_gdb_l3_feature                  \
diff --git a/src/plugins/gbp/gbp_learn.h b/src/plugins/gbp/gbp_learn.h
index a000905e63a..b4f3ae0a23d 100644
--- a/src/plugins/gbp/gbp_learn.h
+++ b/src/plugins/gbp/gbp_learn.h
@@ -18,6 +18,8 @@
 
 #include <plugins/gbp/gbp.h>
 
+#include <vnet/util/throttle.h>
+
 /**
  * The maximum learning rate per-hashed EP
  */
diff --git a/src/plugins/ioam/ip6/ioam_cache_node.c b/src/plugins/ioam/ip6/ioam_cache_node.c
index 9c2b4697d8c..6a5465b86aa 100644
--- a/src/plugins/ioam/ip6/ioam_cache_node.c
+++ b/src/plugins/ioam/ip6/ioam_cache_node.c
@@ -46,6 +46,7 @@
 #include <ioam/ip6/ioam_cache.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <vnet/ip/ip6_hop_by_hop_packet.h>
+#include <vnet/ip/ip6_inlines.h>
 
 typedef struct
 {
diff --git a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
index 633a9becabc..d2c7f20a778 100644
--- a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
+++ b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
@@ -46,6 +46,7 @@
 #include <ioam/ip6/ioam_cache.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <vnet/ip/ip6_hop_by_hop_packet.h>
+#include <vnet/ip/ip6_inlines.h>
 
 typedef struct
 {
diff --git a/src/plugins/l2e/l2e.c b/src/plugins/l2e/l2e.c
index 791c3f67cb6..4c6eac50446 100644
--- a/src/plugins/l2e/l2e.c
+++ b/src/plugins/l2e/l2e.c
@@ -19,6 +19,7 @@
 #include <plugins/l2e/l2e.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/l2/feat_bitmap.h>
+#include <vnet/ip/ip.h>
 
 l2_emulation_main_t l2_emulation_main;
 
diff --git a/src/plugins/lisp/lisp-cp/lisp_cp_test.c b/src/plugins/lisp/lisp-cp/lisp_cp_test.c
index faffb738c04..c0284d301a7 100644
--- a/src/plugins/lisp/lisp-cp/lisp_cp_test.c
+++ b/src/plugins/lisp/lisp-cp/lisp_cp_test.c
@@ -20,6 +20,7 @@
 
 #include <vnet/ip/ip_format_fns.h>
 #include <vnet/ethernet/ethernet_format_fns.h>
+#include <vnet/ethernet/mac_address.h>
 #include <lisp/lisp-cp/lisp_types.h>
 
 /* define message IDs */
diff --git a/src/plugins/lisp/lisp-cp/one_test.c b/src/plugins/lisp/lisp-cp/one_test.c
index 42554576fa0..6966122b2b5 100644
--- a/src/plugins/lisp/lisp-cp/one_test.c
+++ b/src/plugins/lisp/lisp-cp/one_test.c
@@ -20,6 +20,7 @@
 
 #include <vnet/ip/ip_format_fns.h>
 #include <vnet/ethernet/ethernet_format_fns.h>
+#include <vnet/ethernet/mac_address.h>
 #include <lisp/lisp-cp/lisp_types.h>
 
 /* define message IDs */
diff --git a/src/plugins/lisp/lisp-cp/packets.c b/src/plugins/lisp/lisp-cp/packets.c
index 95f95cdb68a..8e2386e72bd 100644
--- a/src/plugins/lisp/lisp-cp/packets.c
+++ b/src/plugins/lisp/lisp-cp/packets.c
@@ -16,6 +16,8 @@
 #include <lisp/lisp-cp/packets.h>
 #include <lisp/lisp-cp/lisp_cp_messages.h>
 #include <vnet/udp/udp_packet.h>
+#include <vnet/ip/ip4_inlines.h>
+#include <vnet/ip/ip6_inlines.h>
 
 /* Returns IP ID for the packet */
 /* static u16 ip_id = 0;
diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c
index 39f99492268..54f7713162a 100644
--- a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c
+++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c
@@ -20,6 +20,7 @@
 
 #include <vnet/ip/ip_format_fns.h>
 #include <vnet/ethernet/ethernet_format_fns.h>
+#include <vnet/ethernet/mac_address.h>
 #include <lisp/lisp-cp/lisp_types.h>
 
 /* define message IDs */
diff --git a/src/plugins/nat/nat.c b/src/plugins/nat/nat.c
index eaecd9658ec..cb0e346c8fc 100644
--- a/src/plugins/nat/nat.c
+++ b/src/plugins/nat/nat.c
@@ -32,6 +32,7 @@
 #include <vnet/ip/reass/ip4_sv_reass.h>
 #include <vppinfra/bihash_16_8.h>
 #include <nat/nat44/ed_inlines.h>
+#include <vnet/ip/ip_table.h>
 
 #include <vpp/app/version.h>
 
-- 
cgit 1.2.3-korg