diff options
author | Neale Ranns <neale@graphiant.com> | 2022-02-15 09:02:27 +0000 |
---|---|---|
committer | Neale Ranns <neale@graphiant.com> | 2022-02-15 09:02:27 +0000 |
commit | f7040f01a57618c899de8d1feb30bcc70b0a45b9 (patch) | |
tree | f23942c61b8a3b8cc496c054d0d2071a85b330c9 /src/plugins | |
parent | cdaf0d8c884ae0f337ef94b0ceb7449c991a3e6c (diff) |
tcp: Do not include the tcp_packet.h file in the ip4_packet.h
Type: refactor
IP4 does not depend on TCP (it's the other way around).
This upside down dependency leads to some nasty circular includes when trying to use ip46_address.h in interface.h
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: I4a1bd21543b08b9c1cf1e5563da738414734a878
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/dpdk/device/node.c | 1 | ||||
-rw-r--r-- | src/plugins/mss_clamp/mss_clamp_node.c | 1 | ||||
-rw-r--r-- | src/plugins/nat/pnat/pnat_api.c | 1 | ||||
-rw-r--r-- | src/plugins/nat/pnat/pnat_node.h | 1 | ||||
-rw-r--r-- | src/plugins/vmxnet3/input.c | 1 | ||||
-rw-r--r-- | src/plugins/wireguard/wireguard.h | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c index d83fa35b177..e0ba517d2ce 100644 --- a/src/plugins/dpdk/device/node.c +++ b/src/plugins/dpdk/device/node.c @@ -26,6 +26,7 @@ #include <vnet/devices/devices.h> #include <vnet/interface/rx_queue_funcs.h> #include <vnet/feature/feature.h> +#include <vnet/tcp/tcp_packet.h> #include <dpdk/device/dpdk_priv.h> diff --git a/src/plugins/mss_clamp/mss_clamp_node.c b/src/plugins/mss_clamp/mss_clamp_node.c index 4a40b2329e1..7c403b129b2 100644 --- a/src/plugins/mss_clamp/mss_clamp_node.c +++ b/src/plugins/mss_clamp/mss_clamp_node.c @@ -24,6 +24,7 @@ #include <vnet/feature/feature.h> #include <vnet/ip/ip4.h> #include <vnet/ip/ip6.h> +#include <vnet/tcp/tcp_packet.h> extern vlib_node_registration_t mssc_ip4_in_node, mssc_ip4_out_node; extern vlib_node_registration_t mssc_ip6_in_node, mssc_ip6_out_node; diff --git a/src/plugins/nat/pnat/pnat_api.c b/src/plugins/nat/pnat/pnat_api.c index 442ee7c42c2..35a73955b33 100644 --- a/src/plugins/nat/pnat/pnat_api.c +++ b/src/plugins/nat/pnat/pnat_api.c @@ -13,6 +13,7 @@ * limitations under the License. */ #include "pnat.h" +#include <vnet/vnet.h> #include <pnat/pnat.api_enum.h> #include <pnat/pnat.api_types.h> #include <vlibmemory/api.h> diff --git a/src/plugins/nat/pnat/pnat_node.h b/src/plugins/nat/pnat/pnat_node.h index 595189c2efb..f1afb450934 100644 --- a/src/plugins/nat/pnat/pnat_node.h +++ b/src/plugins/nat/pnat/pnat_node.h @@ -20,6 +20,7 @@ #include <pnat/pnat.api_enum.h> #include <vnet/feature/feature.h> #include <vnet/udp/udp_packet.h> +#include <vnet/tcp/tcp_packet.h> #include <vnet/ip/format.h> /* PNAT next-nodes */ diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c index 25d39ddaf91..a58e2c157be 100644 --- a/src/plugins/vmxnet3/input.c +++ b/src/plugins/vmxnet3/input.c @@ -23,6 +23,7 @@ #include <vnet/ip/ip6_packet.h> #include <vnet/ip/ip4_packet.h> #include <vnet/udp/udp_packet.h> +#include <vnet/tcp/tcp_packet.h> #include <vnet/interface/rx_queue_funcs.h> #include <vmxnet3/vmxnet3.h> diff --git a/src/plugins/wireguard/wireguard.h b/src/plugins/wireguard/wireguard.h index 965c34aca50..ba96864fc27 100644 --- a/src/plugins/wireguard/wireguard.h +++ b/src/plugins/wireguard/wireguard.h @@ -18,6 +18,7 @@ #include <wireguard/wireguard_index_table.h> #include <wireguard/wireguard_messages.h> #include <wireguard/wireguard_timer.h> +#include <vnet/buffer.h> #define WG_DEFAULT_DATA_SIZE 2048 |