From: "Szőke Benjamin" <egyszeregy@freemail.hu>
To: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org,
daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com,
davem@davemloft.net, dsahern@kernel.org, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, horms@kernel.org,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h
Date: Tue, 7 Jan 2025 22:48:55 +0100 [thread overview]
Message-ID: <f53d51a9-e6d6-4376-8601-420ac756b7af@freemail.hu> (raw)
In-Reply-To: <eb46258b-0fb2-c0be-f1aa-79497f3dc536@netfilter.org>
2025. 01. 07. 20:26 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
>
>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>
>> Merge ipt_ECN.h to ipt_ecn.h header file.
>>
>> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
>> ---
>> include/uapi/linux/netfilter_ipv4/ipt_ECN.h | 29 +--------------------
>> include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 26 ++++++++++++++++++
>> 2 files changed, 27 insertions(+), 28 deletions(-)
>>
>> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
>> index e3630fd045b8..6727f5a44512 100644
>> --- a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
>> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
>> @@ -1,34 +1,7 @@
>> /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>> -/* Header file for iptables ipt_ECN target
>> - *
>> - * (C) 2002 by Harald Welte <laforge@gnumonks.org>
>> - *
>> - * This software is distributed under GNU GPL v2, 1991
>> - *
>> - * ipt_ECN.h,v 1.3 2002/05/29 12:17:40 laforge Exp
>> -*/
>> #ifndef _IPT_ECN_TARGET_H
>> #define _IPT_ECN_TARGET_H
>>
>> -#include <linux/types.h>
>> -#include <linux/netfilter/xt_DSCP.h>
>> -
>> -#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
>
If it is not dropped out in the merged header file, it will cause a build error
because of the previous bad and duplicated header architects in the UAPI:
In file included from ../net/ipv4/netfilter/ipt_ECN.c:17:
../include/uapi/linux/netfilter_ipv4/ipt_ecn.h:17:25: error: expected identifier
before ‘(’ token
#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
^
../include/uapi/linux/netfilter_ipv4/ipt_ecn.h:27:2: note: in expansion of macro
‘IPT_ECN_IP_MASK’
IPT_ECN_IP_MASK = XT_ECN_IP_MASK,
^~~~~~~~~~~~~~~
Please spent more time then 10 mins about the reviewing and make some test build
and you can see there was a conflict about how mades a fixed constant in the
code -> It is a #define vs. enum issue.
Only one style should have been used before, and not mix them.
> The definition above is removed from here but not added to ipt_ecn.h, so
> it's missing now. Please fix it in the next round of the patchset.
>
>> -#define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */
>> -#define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */
>> -#define IPT_ECN_OP_SET_CWR 0x20 /* set CWR bit of TCP header */
>> -
>> -#define IPT_ECN_OP_MASK 0xce
>> -
>> -struct ipt_ECN_info {
>> - __u8 operation; /* bitset of operations */
>> - __u8 ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */
>> - union {
>> - struct {
>> - __u8 ece:1, cwr:1; /* TCP ECT bits */
>> - } tcp;
>> - } proto;
>> -};
>> +#include <linux/netfilter_ipv4/ipt_ecn.h>
>>
>> #endif /* _IPT_ECN_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
>> index 8121bec47026..a6d479aece21 100644
>> --- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
>> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
>> @@ -1,10 +1,26 @@
>> /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>> +/* Header file for iptables ipt_ECN target and match
>> + *
>> + * (C) 2002 by Harald Welte <laforge@gnumonks.org>
>> + *
>> + * This software is distributed under GNU GPL v2, 1991
>> + *
>> + * ipt_ECN.h,v 1.3 2002/05/29 12:17:40 laforge Exp
>> + */
>> #ifndef _IPT_ECN_H
>> #define _IPT_ECN_H
>>
>> +#include <linux/types.h>
>> +#include <linux/netfilter/xt_dscp.h>
>> #include <linux/netfilter/xt_ecn.h>
>> +
>> #define ipt_ecn_info xt_ecn_info
>>
>> +#define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */
>> +#define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */
>> +#define IPT_ECN_OP_SET_CWR 0x20 /* set CWR bit of TCP header */
>> +#define IPT_ECN_OP_MASK 0xce
>> +
>> enum {
>> IPT_ECN_IP_MASK = XT_ECN_IP_MASK,
>> IPT_ECN_OP_MATCH_IP = XT_ECN_OP_MATCH_IP,
>> @@ -13,4 +29,14 @@ enum {
>> IPT_ECN_OP_MATCH_MASK = XT_ECN_OP_MATCH_MASK,
>> };
>>
>> +struct ipt_ECN_info {
>> + __u8 operation; /* bitset of operations */
>> + __u8 ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */
>> + union {
>> + struct {
>> + __u8 ece:1, cwr:1; /* TCP ECT bits */
>> + } tcp;
>> + } proto;
>> +};
>> +
>> #endif /* IPT_ECN_H */
>> --
>> 2.43.5
>>
>>
>
> Best regards,
> Jozsef
next prev parent reply other threads:[~2025-01-07 21:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 2:41 [PATCH 00/10] netfilter: x_tables: Merge xt_*.h and ipt_*.h files which has same name egyszeregy
2025-01-07 2:41 ` [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h egyszeregy
2025-01-07 19:23 ` Jozsef Kadlecsik
2025-01-07 21:38 ` Szőke Benjamin
2025-01-08 20:11 ` Jozsef Kadlecsik
2025-01-08 21:08 ` Szőke Benjamin
2025-01-09 14:59 ` Jozsef Kadlecsik
2025-01-07 2:41 ` [PATCH 02/10] netfilter: x_tables: Merge xt_RATEEST.h to xt_rateest.h egyszeregy
2025-01-07 2:41 ` [PATCH 03/10] netfilter: x_tables: Merge xt_TCPMSS.h to xt_tcpmss.h egyszeregy
2025-01-07 2:41 ` [PATCH 04/10] netfilter: x_tables: Use consistent header guard egyszeregy
2025-01-07 2:41 ` [PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h egyszeregy
2025-01-07 19:26 ` Jozsef Kadlecsik
2025-01-07 21:48 ` Szőke Benjamin [this message]
2025-01-08 20:15 ` Jozsef Kadlecsik
2025-01-07 2:41 ` [PATCH 06/10] netfilter: iptables: Merge ipt_TTL.h to ipt_ttl.h egyszeregy
2025-01-07 2:41 ` [PATCH 07/10] netfilter: iptables: Merge ip6t_HL.h to ip6t_hl.h egyszeregy
2025-01-07 2:41 ` [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files egyszeregy
2025-01-07 19:39 ` Jozsef Kadlecsik
2025-01-07 21:59 ` Szőke Benjamin
2025-01-08 20:20 ` Jozsef Kadlecsik
2025-01-08 21:18 ` Szőke Benjamin
2025-01-07 2:41 ` [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h egyszeregy
2025-01-07 19:39 ` Jozsef Kadlecsik
2025-01-07 22:06 ` Szőke Benjamin
2025-01-07 22:38 ` Jan Engelhardt
2025-01-07 23:24 ` Szőke Benjamin
2025-01-08 20:51 ` Jozsef Kadlecsik
2025-01-08 21:38 ` Szőke Benjamin
2025-01-09 10:22 ` Przemek Kitszel
2025-01-07 2:41 ` [PATCH 10/10] netfilter: Use merged xt_*.h, ipt_*.h headers egyszeregy
2025-01-07 19:14 ` [PATCH 00/10] netfilter: x_tables: Merge xt_*.h and ipt_*.h files which has same name Jozsef Kadlecsik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f53d51a9-e6d6-4376-8601-420ac756b7af@freemail.hu \
--to=egyszeregy@freemail.hu \
--cc=amiculas@cisco.com \
--cc=coreteam@netfilter.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=horms@kernel.org \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®