From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 5DEDF5A026F for ; Tue, 16 Jan 2024 01:50:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1705366246; bh=QvV3DcfiBzpeCizuE/W4f1Mcyiu8bbJO907/hvm/4PE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K8aHsvGfz1pWHOz4qDXUfwW/0Fap9sNtTSf/AT9KCqo5X9nsi9hcOPsnpOGD/kYZz Cs+ojBQQV4/mhebVOk3gWRMRIXwcgpO5zdxGJ7iJ3f4Vy0ZWuXKC74y6M1eCo8My1H ovkOUHbbVWu/SYnem7op2aWFiXN3LKV9hck/XmAeHpZarvUUiwnyzfxNJXd5NlIuQr fUWWnMaGoy0LR3Q+lqE4FjfmteUEOr+zISEbQp/KDFG1cAPcZbWAf6LeTqikbSK4nZ psbuH2BoZ6SDKcTzkzn6brgGnSCWW3GEdzfV3t9/oteT9Rh6GRblIGF2o+DnQRrrHA ibumBODHxjcnQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TDVmk1s2Fz4wb0; Tue, 16 Jan 2024 11:50:46 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v4 01/13] flow: Make flow_table.h #include the protocol specific headers it needs Date: Tue, 16 Jan 2024 11:50:31 +1100 Message-ID: <20240116005043.2212259-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116005043.2212259-1-david@gibson.dropbear.id.au> References: <20240116005043.2212259-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZSVQ6DPBLR73X6V2WHKVMQVWPDJ5GDWR X-Message-ID-Hash: ZSVQ6DPBLR73X6V2WHKVMQVWPDJ5GDWR X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: flow_table.h, the lower level flow header relies on having the struct definitions for every protocol specific flow type - so far that means tcp_conn.h. It doesn't include it itself, so tcp_conn.h must be included before flow_table.h. That's ok for now, but as we use the flow table for more things, flow_table.h will need the structs for all of them, which means the protocol specific .c files would need to include tcp_conn.h _and_ the equivalents for every other flow type before flow_table.h every time, which is weird. So, although we *mostly* lean towards the include style where .c files need to handle the include dependencies, in this case it makes more sense to have flow_table.h include all the protocol specific headers it needs. Signed-off-by: David Gibson --- flow.c | 1 - flow_table.h | 2 ++ tcp.c | 1 - tcp_splice.c | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flow.c b/flow.c index a8aeb15..c3f4886 100644 --- a/flow.c +++ b/flow.c @@ -15,7 +15,6 @@ #include "siphash.h" #include "inany.h" #include "flow.h" -#include "tcp_conn.h" #include "flow_table.h" const char *flow_type_str[] = { diff --git a/flow_table.h b/flow_table.h index 0dee66f..e805f10 100644 --- a/flow_table.h +++ b/flow_table.h @@ -7,6 +7,8 @@ #ifndef FLOW_TABLE_H #define FLOW_TABLE_H +#include "tcp_conn.h" + /** * union flow - Descriptor for a logical packet flow (e.g. connection) * @f: Fields common between all variants diff --git a/tcp.c b/tcp.c index 5b37662..22c3a0e 100644 --- a/tcp.c +++ b/tcp.c @@ -298,7 +298,6 @@ #include "inany.h" #include "flow.h" -#include "tcp_conn.h" #include "flow_table.h" /* Sides of a flow as we use them in "tap" connections */ diff --git a/tcp_splice.c b/tcp_splice.c index 0e2e04c..a91cb37 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -56,7 +56,6 @@ #include "inany.h" #include "flow.h" -#include "tcp_conn.h" #include "flow_table.h" #define MAX_PIPE_SIZE (8UL * 1024 * 1024) -- 2.43.0