[PATCH 00/10] netfilter: x_tables: Merge xt_*.h and ipt_*.h files which has same name.

[PATCH 00/10] netfilter: x_tables: Merge xt_*.h and ipt_*.h files which has same name.

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Merge xt_*.h, ipt_*.h and ip6t_*.h header files, which has
same upper and lowercase name format.

Display information about deprecated xt_*.h, ipt_*.h files
at compile time. Recommended to use header files with
lowercase name format in the future.

Benjamin Szőke (10):
  netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h
  netfilter: x_tables: Merge xt_RATEEST.h to xt_rateest.h
  netfilter: x_tables: Merge xt_TCPMSS.h to xt_tcpmss.h
  netfilter: x_tables: Use consistent header guard
  netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h
  netfilter: iptables: Merge ipt_TTL.h to ipt_ttl.h
  netfilter: iptables: Merge ip6t_HL.h to ip6t_hl.h
  netfilter: Adjust code style of xt_*.h, ipt_*.h files.
  netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.
  netfilter: Use merged xt_*.h, ipt_*.h headers.

 include/uapi/linux/netfilter/xt_CONNMARK.h  |  8 +++---
 include/uapi/linux/netfilter/xt_DSCP.h      | 22 ++--------------
 include/uapi/linux/netfilter/xt_MARK.h      |  8 +++---
 include/uapi/linux/netfilter/xt_RATEEST.h   | 12 ++-------
 include/uapi/linux/netfilter/xt_TCPMSS.h    | 14 ++++------
 include/uapi/linux/netfilter/xt_connmark.h  |  7 +++--
 include/uapi/linux/netfilter/xt_dscp.h      | 26 +++++++++++++-----
 include/uapi/linux/netfilter/xt_mark.h      |  6 ++---
 include/uapi/linux/netfilter/xt_rateest.h   | 19 ++++++++++----
 include/uapi/linux/netfilter/xt_tcpmss.h    | 16 ++++++++----
 include/uapi/linux/netfilter_ipv4/ipt_ECN.h | 29 ++-------------------
 include/uapi/linux/netfilter_ipv4/ipt_TTL.h | 25 ++++--------------
 include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 26 ++++++++++++++++++
 include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 24 ++++++++++++-----
 include/uapi/linux/netfilter_ipv6/ip6t_HL.h | 26 ++++--------------
 include/uapi/linux/netfilter_ipv6/ip6t_hl.h | 23 +++++++++++-----
 net/ipv4/netfilter/ipt_ECN.c                |  2 +-
 net/netfilter/xt_DSCP.c                     |  2 +-
 net/netfilter/xt_HL.c                       |  4 +--
 net/netfilter/xt_RATEEST.c                  |  2 +-
 net/netfilter/xt_TCPMSS.c                   |  2 +-
 21 files changed, 148 insertions(+), 155 deletions(-)

-- 
2.43.5

[PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Merge xt_DSCP.h to xt_dscp.h header file.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter/xt_DSCP.h | 22 +---------------------
 include/uapi/linux/netfilter/xt_dscp.h | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
index 223d635e8b6f..fcff72347256 100644
--- a/include/uapi/linux/netfilter/xt_DSCP.h
+++ b/include/uapi/linux/netfilter/xt_DSCP.h
@@ -1,27 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* x_tables module for setting the IPv4/IPv6 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
- * This software is distributed under GNU GPL v2, 1991
- *
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
-*/
 #ifndef _XT_DSCP_TARGET_H
 #define _XT_DSCP_TARGET_H
-#include <linux/netfilter/xt_dscp.h>
-#include <linux/types.h>
-
-/* target info */
-struct xt_DSCP_info {
-	__u8 dscp;
-};
 
-struct xt_tos_target_info {
-	__u8 tos_value;
-	__u8 tos_mask;
-};
+#include <linux/netfilter/xt_dscp.h>
 
 #endif /* _XT_DSCP_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
index 7594e4df8587..bcfe4afa6351 100644
--- a/include/uapi/linux/netfilter/xt_dscp.h
+++ b/include/uapi/linux/netfilter/xt_dscp.h
@@ -1,15 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* x_tables module for matching the IPv4/IPv6 DSCP field
+/* x_tables module for matching/modifying the IPv4/IPv6 DSCP field
  *
  * (C) 2002 Harald Welte <laforge@gnumonks.org>
+ * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
  * This software is distributed under GNU GPL v2, 1991
  *
  * See RFC2474 for a description of the DSCP field within the IP Header.
  *
+ * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
  * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
 */
-#ifndef _XT_DSCP_H
-#define _XT_DSCP_H
+#ifndef _UAPI_XT_DSCP_H
+#define _UAPI_XT_DSCP_H
 
 #include <linux/types.h>
 
@@ -29,4 +31,14 @@ struct xt_tos_match_info {
 	__u8 invert;
 };
 
-#endif /* _XT_DSCP_H */
+/* target info */
+struct xt_DSCP_info {
+	__u8 dscp;
+};
+
+struct xt_tos_target_info {
+	__u8 tos_value;
+	__u8 tos_mask;
+};
+
+#endif /* _UAPI_XT_DSCP_H */
-- 
2.43.5

[PATCH 02/10] netfilter: x_tables: Merge xt_RATEEST.h to xt_rateest.h

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Merge xt_RATEEST.h to xt_rateest.h header file.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter/xt_RATEEST.h | 12 +-----------
 include/uapi/linux/netfilter/xt_rateest.h | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/uapi/linux/netfilter/xt_RATEEST.h b/include/uapi/linux/netfilter/xt_RATEEST.h
index 2b87a71e6266..f817b5387164 100644
--- a/include/uapi/linux/netfilter/xt_RATEEST.h
+++ b/include/uapi/linux/netfilter/xt_RATEEST.h
@@ -2,16 +2,6 @@
 #ifndef _XT_RATEEST_TARGET_H
 #define _XT_RATEEST_TARGET_H
 
-#include <linux/types.h>
-#include <linux/if.h>
-
-struct xt_rateest_target_info {
-	char			name[IFNAMSIZ];
-	__s8			interval;
-	__u8		ewma_log;
-
-	/* Used internally by the kernel */
-	struct xt_rateest	*est __attribute__((aligned(8)));
-};
+#include <linux/netfilter/xt_rateest.h>
 
 #endif /* _XT_RATEEST_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_rateest.h b/include/uapi/linux/netfilter/xt_rateest.h
index 52a37bdc1837..da9727fa527b 100644
--- a/include/uapi/linux/netfilter/xt_rateest.h
+++ b/include/uapi/linux/netfilter/xt_rateest.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_RATEEST_MATCH_H
-#define _XT_RATEEST_MATCH_H
+#ifndef _UAPI_XT_RATEEST_H
+#define _UAPI_XT_RATEEST_H
 
 #include <linux/types.h>
 #include <linux/if.h>
@@ -36,4 +36,13 @@ struct xt_rateest_match_info {
 	struct xt_rateest	*est2 __attribute__((aligned(8)));
 };
 
-#endif /* _XT_RATEEST_MATCH_H */
+struct xt_rateest_target_info {
+	char		name[IFNAMSIZ];
+	__s8		interval;
+	__u8		ewma_log;
+
+	/* Used internally by the kernel */
+	struct xt_rateest	*est __attribute__((aligned(8)));
+};
+
+#endif /* _UAPI_XT_RATEEST_H */
-- 
2.43.5

[PATCH 03/10] netfilter: x_tables: Merge xt_TCPMSS.h to xt_tcpmss.h

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Merge xt_TCPMSS.h to xt_tcpmss.h header file.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter/xt_TCPMSS.h | 14 ++++----------
 include/uapi/linux/netfilter/xt_tcpmss.h | 12 +++++++++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/uapi/linux/netfilter/xt_TCPMSS.h b/include/uapi/linux/netfilter/xt_TCPMSS.h
index 65ea6c9dab4b..154e88c1de02 100644
--- a/include/uapi/linux/netfilter/xt_TCPMSS.h
+++ b/include/uapi/linux/netfilter/xt_TCPMSS.h
@@ -1,13 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_TCPMSS_H
-#define _XT_TCPMSS_H
+#ifndef _XT_TCPMSS_TARGET_H
+#define _XT_TCPMSS_TARGET_H
 
-#include <linux/types.h>
+#include <linux/netfilter/xt_tcpmss.h>
 
-struct xt_tcpmss_info {
-	__u16 mss;
-};
-
-#define XT_TCPMSS_CLAMP_PMTU 0xffff
-
-#endif /* _XT_TCPMSS_H */
+#endif /* _XT_TCPMSS_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_tcpmss.h b/include/uapi/linux/netfilter/xt_tcpmss.h
index 2268f58b4dec..3ee4acaa6e03 100644
--- a/include/uapi/linux/netfilter/xt_tcpmss.h
+++ b/include/uapi/linux/netfilter/xt_tcpmss.h
@@ -1,12 +1,18 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_TCPMSS_MATCH_H
-#define _XT_TCPMSS_MATCH_H
+#ifndef _UAPI_XT_TCPMSS_H
+#define _UAPI_XT_TCPMSS_H
 
 #include <linux/types.h>
 
+#define XT_TCPMSS_CLAMP_PMTU	0xffff
+
 struct xt_tcpmss_match_info {
     __u16 mss_min, mss_max;
     __u8 invert;
 };
 
-#endif /*_XT_TCPMSS_MATCH_H*/
+struct xt_tcpmss_info {
+	__u16 mss;
+};
+
+#endif /* _UAPI_XT_TCPMSS_H */
-- 
2.43.5

[PATCH 04/10] netfilter: x_tables: Use consistent header guard

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Use consistent header guard in xt_connmark.h and xt_mark.h files.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter/xt_CONNMARK.h | 6 +++---
 include/uapi/linux/netfilter/xt_MARK.h     | 6 +++---
 include/uapi/linux/netfilter/xt_connmark.h | 7 +++----
 include/uapi/linux/netfilter/xt_mark.h     | 6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/uapi/linux/netfilter/xt_CONNMARK.h b/include/uapi/linux/netfilter/xt_CONNMARK.h
index 36cc956ead1a..171af24ef679 100644
--- a/include/uapi/linux/netfilter/xt_CONNMARK.h
+++ b/include/uapi/linux/netfilter/xt_CONNMARK.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_CONNMARK_H_target
-#define _XT_CONNMARK_H_target
+#ifndef _XT_CONNMARK_TARGET_H
+#define _XT_CONNMARK_TARGET_H
 
 #include <linux/netfilter/xt_connmark.h>
 
-#endif /*_XT_CONNMARK_H_target*/
+#endif /* _XT_CONNMARK_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_MARK.h b/include/uapi/linux/netfilter/xt_MARK.h
index f1fe2b4be933..cdc12c0954b3 100644
--- a/include/uapi/linux/netfilter/xt_MARK.h
+++ b/include/uapi/linux/netfilter/xt_MARK.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_MARK_H_target
-#define _XT_MARK_H_target
+#ifndef _XT_MARK_H_TARGET_H
+#define _XT_MARK_H_TARGET_H
 
 #include <linux/netfilter/xt_mark.h>
 
-#endif /*_XT_MARK_H_target */
+#endif /* _XT_MARK_H_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_connmark.h b/include/uapi/linux/netfilter/xt_connmark.h
index 41b578ccd03b..a3f03729805b 100644
--- a/include/uapi/linux/netfilter/xt_connmark.h
+++ b/include/uapi/linux/netfilter/xt_connmark.h
@@ -2,9 +2,8 @@
 /* Copyright (C) 2002,2004 MARA Systems AB <https://www.marasystems.com>
  * by Henrik Nordstrom <hno@marasystems.com>
  */
-
-#ifndef _XT_CONNMARK_H
-#define _XT_CONNMARK_H
+#ifndef _UAPI_XT_CONNMARK_H
+#define _UAPI_XT_CONNMARK_H
 
 #include <linux/types.h>
 
@@ -34,4 +33,4 @@ struct xt_connmark_mtinfo1 {
 	__u8 invert;
 };
 
-#endif /*_XT_CONNMARK_H*/
+#endif /* _UAPI_XT_CONNMARK_H */
diff --git a/include/uapi/linux/netfilter/xt_mark.h b/include/uapi/linux/netfilter/xt_mark.h
index 9d0526ced8f0..adcd90b00786 100644
--- a/include/uapi/linux/netfilter/xt_mark.h
+++ b/include/uapi/linux/netfilter/xt_mark.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_MARK_H
-#define _XT_MARK_H
+#ifndef _UAPI_XT_MARK_H
+#define _UAPI_XT_MARK_H
 
 #include <linux/types.h>
 
@@ -13,4 +13,4 @@ struct xt_mark_mtinfo1 {
 	__u8 invert;
 };
 
-#endif /*_XT_MARK_H*/
+#endif /* _UAPI_XT_MARK_H */
-- 
2.43.5

[PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h

[egyszeregy]

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)
-
-#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

[PATCH 06/10] netfilter: iptables: Merge ipt_TTL.h to ipt_ttl.h

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Merge ipt_TTL.h to ipt_ttl.h header file.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter_ipv4/ipt_TTL.h | 25 ++++-----------------
 include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 21 +++++++++++++----
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
index 57d2fc67a943..5d989199ed28 100644
--- a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
@@ -1,24 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* TTL modification module for IP tables
- * (C) 2000 by Harald Welte <laforge@netfilter.org> */
+#ifndef _IPT_TTL_TARGET_H
+#define _IPT_TTL_TARGET_H
 
-#ifndef _IPT_TTL_H
-#define _IPT_TTL_H
+#include <linux/netfilter_ipv4/ipt_ttl.h>
 
-#include <linux/types.h>
-
-enum {
-	IPT_TTL_SET = 0,
-	IPT_TTL_INC,
-	IPT_TTL_DEC
-};
-
-#define IPT_TTL_MAXMODE	IPT_TTL_DEC
-
-struct ipt_TTL_info {
-	__u8	mode;
-	__u8	ttl;
-};
-
-
-#endif
+#endif /* _IPT_TTL_TARGET_H */
diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
index ad0226a8629b..c21eb6651353 100644
--- a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* IP tables module for matching the value of the TTL
- * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
-
+/* iptables module for matching/modifying the TTL value
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2000 by Harald Welte <laforge@netfilter.org>
+ */
 #ifndef _IPT_TTL_H
 #define _IPT_TTL_H
 
@@ -20,5 +21,17 @@ struct ipt_ttl_info {
 	__u8	ttl;
 };
 
+enum {
+	IPT_TTL_SET = 0,
+	IPT_TTL_INC,
+	IPT_TTL_DEC
+};
+
+#define IPT_TTL_MAXMODE	IPT_TTL_DEC
+
+struct ipt_TTL_info {
+	__u8	mode;
+	__u8	ttl;
+};
 
-#endif
+#endif /* _IPT_TTL_H */
-- 
2.43.5

[PATCH 07/10] netfilter: iptables: Merge ip6t_HL.h to ip6t_hl.h

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Merge ip6t_HL.h to ip6t_hl.h header file.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter_ipv6/ip6t_HL.h | 26 ++++-----------------
 include/uapi/linux/netfilter_ipv6/ip6t_hl.h | 20 ++++++++++++----
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
index eaed56a287b4..bcf22824b393 100644
--- a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
@@ -1,25 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* Hop Limit modification module for ip6tables
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's TTL module */
+#ifndef _IP6T_HL_TARGET_H
+#define _IP6T_HL_TARGET_H
 
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
+#include <linux/netfilter_ipv6/ip6t_hl.h>
 
-#include <linux/types.h>
-
-enum {
-	IP6T_HL_SET = 0,
-	IP6T_HL_INC,
-	IP6T_HL_DEC
-};
-
-#define IP6T_HL_MAXMODE	IP6T_HL_DEC
-
-struct ip6t_HL_info {
-	__u8	mode;
-	__u8	hop_limit;
-};
-
-
-#endif
+#endif /* _IP6T_HL_TARGET_H */
diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
index 6b62f9418eb2..caef38a63b8f 100644
--- a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* ip6tables module for matching the Hop Limit value
+/* ip6tables module for matching/modifying the Hop Limit value
  * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's ttl module */
-
+ * Based on HW's ttl module
+ */
 #ifndef _IP6T_HL_H
 #define _IP6T_HL_H
 
@@ -21,5 +21,17 @@ struct ip6t_hl_info {
 	__u8	hop_limit;
 };
 
+enum {
+	IP6T_HL_SET = 0,
+	IP6T_HL_INC,
+	IP6T_HL_DEC
+};
+
+#define IP6T_HL_MAXMODE	IP6T_HL_DEC
+
+struct ip6t_HL_info {
+	__u8	mode;
+	__u8	hop_limit;
+};
 
-#endif
+#endif /* _IP6T_HL_H */
-- 
2.43.5

[PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files.

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

- Adjust tab indents
- Fix format of #define macros

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter/xt_dscp.h      | 6 +++---
 include/uapi/linux/netfilter/xt_rateest.h   | 4 ++--
 include/uapi/linux/netfilter/xt_tcpmss.h    | 6 +++---
 include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 8 ++++----
 include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 3 +--
 include/uapi/linux/netfilter_ipv6/ip6t_hl.h | 3 +--
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
index bcfe4afa6351..22b6488ef2e7 100644
--- a/include/uapi/linux/netfilter/xt_dscp.h
+++ b/include/uapi/linux/netfilter/xt_dscp.h
@@ -15,9 +15,9 @@
 
 #include <linux/types.h>
 
-#define XT_DSCP_MASK	0xfc	/* 11111100 */
-#define XT_DSCP_SHIFT	2
-#define XT_DSCP_MAX	0x3f	/* 00111111 */
+#define XT_DSCP_MASK	(0xfc)	/* 11111100 */
+#define XT_DSCP_SHIFT	(2)
+#define XT_DSCP_MAX		(0x3f)	/* 00111111 */
 
 /* match info */
 struct xt_dscp_info {
diff --git a/include/uapi/linux/netfilter/xt_rateest.h b/include/uapi/linux/netfilter/xt_rateest.h
index da9727fa527b..f719bd501d1a 100644
--- a/include/uapi/linux/netfilter/xt_rateest.h
+++ b/include/uapi/linux/netfilter/xt_rateest.h
@@ -22,8 +22,8 @@ enum xt_rateest_match_mode {
 };
 
 struct xt_rateest_match_info {
-	char			name1[IFNAMSIZ];
-	char			name2[IFNAMSIZ];
+	char		name1[IFNAMSIZ];
+	char		name2[IFNAMSIZ];
 	__u16		flags;
 	__u16		mode;
 	__u32		bps1;
diff --git a/include/uapi/linux/netfilter/xt_tcpmss.h b/include/uapi/linux/netfilter/xt_tcpmss.h
index 3ee4acaa6e03..ad858ae93e6a 100644
--- a/include/uapi/linux/netfilter/xt_tcpmss.h
+++ b/include/uapi/linux/netfilter/xt_tcpmss.h
@@ -4,11 +4,11 @@
 
 #include <linux/types.h>
 
-#define XT_TCPMSS_CLAMP_PMTU	0xffff
+#define XT_TCPMSS_CLAMP_PMTU	(0xffff)
 
 struct xt_tcpmss_match_info {
-    __u16 mss_min, mss_max;
-    __u8 invert;
+	__u16 mss_min, mss_max;
+	__u8 invert;
 };
 
 struct xt_tcpmss_info {
diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
index a6d479aece21..0594dd49d13f 100644
--- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
@@ -16,10 +16,10 @@
 
 #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
+#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,
diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
index c21eb6651353..15c75a4ba355 100644
--- a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
@@ -9,13 +9,12 @@
 #include <linux/types.h>
 
 enum {
-	IPT_TTL_EQ = 0,		/* equals */
+	IPT_TTL_EQ = 0,	/* equals */
 	IPT_TTL_NE,		/* not equals */
 	IPT_TTL_LT,		/* less than */
 	IPT_TTL_GT,		/* greater than */
 };
 
-
 struct ipt_ttl_info {
 	__u8	mode;
 	__u8	ttl;
diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
index caef38a63b8f..4af05c86dcd5 100644
--- a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
@@ -9,13 +9,12 @@
 #include <linux/types.h>
 
 enum {
-	IP6T_HL_EQ = 0,		/* equals */
+	IP6T_HL_EQ = 0,	/* equals */
 	IP6T_HL_NE,		/* not equals */
 	IP6T_HL_LT,		/* less than */
 	IP6T_HL_GT,		/* greater than */
 };
 
-
 struct ip6t_hl_info {
 	__u8	mode;
 	__u8	hop_limit;
-- 
2.43.5

[PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Display information about deprecated xt_*.h, ipt_*.h files
at compile time. Recommended to use header files with
lowercase name format in the future.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 include/uapi/linux/netfilter/xt_CONNMARK.h  | 2 ++
 include/uapi/linux/netfilter/xt_DSCP.h      | 2 ++
 include/uapi/linux/netfilter/xt_MARK.h      | 2 ++
 include/uapi/linux/netfilter/xt_RATEEST.h   | 2 ++
 include/uapi/linux/netfilter/xt_TCPMSS.h    | 2 ++
 include/uapi/linux/netfilter_ipv4/ipt_ECN.h | 2 ++
 include/uapi/linux/netfilter_ipv4/ipt_TTL.h | 2 ++
 include/uapi/linux/netfilter_ipv6/ip6t_HL.h | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/include/uapi/linux/netfilter/xt_CONNMARK.h b/include/uapi/linux/netfilter/xt_CONNMARK.h
index 171af24ef679..1bc991fd546a 100644
--- a/include/uapi/linux/netfilter/xt_CONNMARK.h
+++ b/include/uapi/linux/netfilter/xt_CONNMARK.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter/xt_connmark.h>
 
+#pragma message("xt_CONNMARK.h header is deprecated. Use xt_connmark.h instead.")
+
 #endif /* _XT_CONNMARK_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
index fcff72347256..bd550292803d 100644
--- a/include/uapi/linux/netfilter/xt_DSCP.h
+++ b/include/uapi/linux/netfilter/xt_DSCP.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter/xt_dscp.h>
 
+#pragma message("xt_DSCP.h header is deprecated. Use xt_dscp.h instead.")
+
 #endif /* _XT_DSCP_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_MARK.h b/include/uapi/linux/netfilter/xt_MARK.h
index cdc12c0954b3..9f6c03e26c96 100644
--- a/include/uapi/linux/netfilter/xt_MARK.h
+++ b/include/uapi/linux/netfilter/xt_MARK.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter/xt_mark.h>
 
+#pragma message("xt_MARK.h header is deprecated. Use xt_mark.h instead.")
+
 #endif /* _XT_MARK_H_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_RATEEST.h b/include/uapi/linux/netfilter/xt_RATEEST.h
index f817b5387164..ec3d68f67b2f 100644
--- a/include/uapi/linux/netfilter/xt_RATEEST.h
+++ b/include/uapi/linux/netfilter/xt_RATEEST.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter/xt_rateest.h>
 
+#pragma message("xt_RATEEST.h header is deprecated. Use xt_rateest.h instead.")
+
 #endif /* _XT_RATEEST_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_TCPMSS.h b/include/uapi/linux/netfilter/xt_TCPMSS.h
index 154e88c1de02..826060264766 100644
--- a/include/uapi/linux/netfilter/xt_TCPMSS.h
+++ b/include/uapi/linux/netfilter/xt_TCPMSS.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter/xt_tcpmss.h>
 
+#pragma message("xt_TCPMSS.h header is deprecated. Use xt_tcpmss.h instead.")
+
 #endif /* _XT_TCPMSS_TARGET_H */
diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
index 6727f5a44512..42317fb3a4e9 100644
--- a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter_ipv4/ipt_ecn.h>
 
+#pragma message("ipt_ECN.h header is deprecated. Use ipt_ecn.h instead.")
+
 #endif /* _IPT_ECN_TARGET_H */
diff --git a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
index 5d989199ed28..1663493e4951 100644
--- a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter_ipv4/ipt_ttl.h>
 
+#pragma message("ipt_TTL.h header is deprecated. Use ipt_ttl.h instead.")
+
 #endif /* _IPT_TTL_TARGET_H */
diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
index bcf22824b393..55f08e20acd2 100644
--- a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
@@ -4,4 +4,6 @@
 
 #include <linux/netfilter_ipv6/ip6t_hl.h>
 
+#pragma message("ip6t_HL.h header is deprecated. Use ip6t_hl.h instead.")
+
 #endif /* _IP6T_HL_TARGET_H */
-- 
2.43.5

[PATCH 10/10] netfilter: Use merged xt_*.h, ipt_*.h headers.

[egyszeregy]

From: Benjamin Szőke <egyszeregy@freemail.hu>

Change to use merged xt_*.h, ipt_*.h header files.

Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
---
 net/ipv4/netfilter/ipt_ECN.c | 2 +-
 net/netfilter/xt_DSCP.c      | 2 +-
 net/netfilter/xt_HL.c        | 4 ++--
 net/netfilter/xt_RATEEST.c   | 2 +-
 net/netfilter/xt_TCPMSS.c    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index 5930d3b02555..1370069a5cac 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -14,7 +14,7 @@
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ipt_ECN.h>
+#include <linux/netfilter_ipv4/ipt_ecn.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
index cfa44515ab72..90f24a6a26c5 100644
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -14,7 +14,7 @@
 #include <net/dsfield.h>
 
 #include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_DSCP.h>
+#include <linux/netfilter/xt_dscp.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("Xtables: DSCP/TOS field modification");
diff --git a/net/netfilter/xt_HL.c b/net/netfilter/xt_HL.c
index 7873b834c300..a847d7a7eacd 100644
--- a/net/netfilter/xt_HL.c
+++ b/net/netfilter/xt_HL.c
@@ -14,8 +14,8 @@
 #include <net/checksum.h>
 
 #include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ipt_TTL.h>
-#include <linux/netfilter_ipv6/ip6t_HL.h>
+#include <linux/netfilter_ipv4/ipt_ttl.h>
+#include <linux/netfilter_ipv6/ip6t_hl.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_AUTHOR("Maciej Soltysiak <solt@dns.toxicfilms.tv>");
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
index 4f49cfc27831..a86bb0e4bb42 100644
--- a/net/netfilter/xt_RATEEST.c
+++ b/net/netfilter/xt_RATEEST.c
@@ -14,7 +14,7 @@
 #include <net/netns/generic.h>
 
 #include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_RATEEST.h>
+#include <linux/netfilter/xt_rateest.h>
 #include <net/netfilter/xt_rateest.h>
 
 #define RATEEST_HSIZE	16
diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
index 116a885adb3c..3dc1320237c2 100644
--- a/net/netfilter/xt_TCPMSS.c
+++ b/net/netfilter/xt_TCPMSS.c
@@ -22,7 +22,7 @@
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_tcpudp.h>
-#include <linux/netfilter/xt_TCPMSS.h>
+#include <linux/netfilter/xt_tcpmss.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
-- 
2.43.5

Re: [PATCH 00/10] netfilter: x_tables: Merge xt_*.h and ipt_*.h files which has same name.

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:

> From: Benjamin Szőke <egyszeregy@freemail.hu>
> 
> Merge xt_*.h, ipt_*.h and ip6t_*.h header files, which has
> same upper and lowercase name format.
> 
> Display information about deprecated xt_*.h, ipt_*.h files
> at compile time. Recommended to use header files with
> lowercase name format in the future.

Much better, thanks indeed! I'm going to comment just the patches where I 
think some improvements are possible in order to focus on those.

Best regards,
Jozsef

Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 3515 bytes --]

On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:

> From: Benjamin Szőke <egyszeregy@freemail.hu>
> 
> Merge xt_DSCP.h to xt_dscp.h header file.

I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h 
header file." (and in the other patches as well).
 
> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
> ---
>  include/uapi/linux/netfilter/xt_DSCP.h | 22 +---------------------
>  include/uapi/linux/netfilter/xt_dscp.h | 20 ++++++++++++++++----
>  2 files changed, 17 insertions(+), 25 deletions(-)
> 
> diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
> index 223d635e8b6f..fcff72347256 100644
> --- a/include/uapi/linux/netfilter/xt_DSCP.h
> +++ b/include/uapi/linux/netfilter/xt_DSCP.h
> @@ -1,27 +1,7 @@
>  /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -/* x_tables module for setting the IPv4/IPv6 DSCP field
> - *
> - * (C) 2002 Harald Welte <laforge@gnumonks.org>
> - * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
> - * This software is distributed under GNU GPL v2, 1991
> - *
> - * See RFC2474 for a description of the DSCP field within the IP Header.
> - *
> - * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
> -*/
>  #ifndef _XT_DSCP_TARGET_H
>  #define _XT_DSCP_TARGET_H
> -#include <linux/netfilter/xt_dscp.h>
> -#include <linux/types.h>
> -
> -/* target info */
> -struct xt_DSCP_info {
> -	__u8 dscp;
> -};
>  
> -struct xt_tos_target_info {
> -	__u8 tos_value;
> -	__u8 tos_mask;
> -};
> +#include <linux/netfilter/xt_dscp.h>
>  
>  #endif /* _XT_DSCP_TARGET_H */
> diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
> index 7594e4df8587..bcfe4afa6351 100644
> --- a/include/uapi/linux/netfilter/xt_dscp.h
> +++ b/include/uapi/linux/netfilter/xt_dscp.h
> @@ -1,15 +1,17 @@
>  /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -/* x_tables module for matching the IPv4/IPv6 DSCP field
> +/* x_tables module for matching/modifying the IPv4/IPv6 DSCP field
>   *
>   * (C) 2002 Harald Welte <laforge@gnumonks.org>
> + * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
>   * This software is distributed under GNU GPL v2, 1991
>   *
>   * See RFC2474 for a description of the DSCP field within the IP Header.
>   *
> + * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
>   * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
>  */

For the sake of history it'd worth to prepend the last two lines with 
something like: "Original version informations before merging the contents 
of the files:"

> -#ifndef _XT_DSCP_H
> -#define _XT_DSCP_H
> +#ifndef _UAPI_XT_DSCP_H
> +#define _UAPI_XT_DSCP_H

In the first four patches you added the _UAPI_ prefix to the header 
guards while in the next three ones you kept the original ones. Please 
use one style consistently.

>  #include <linux/types.h>
>  
> @@ -29,4 +31,14 @@ struct xt_tos_match_info {
>  	__u8 invert;
>  };
>  
> -#endif /* _XT_DSCP_H */
> +/* target info */
> +struct xt_DSCP_info {
> +	__u8 dscp;
> +};
> +
> +struct xt_tos_target_info {
> +	__u8 tos_value;
> +	__u8 tos_mask;
> +};
> +
> +#endif /* _UAPI_XT_DSCP_H */
> -- 
> 2.43.5
> 
> 

Best regards,
Jozsef
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 3685 bytes --]

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)

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
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files.

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 4784 bytes --]

On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:

> From: Benjamin Szőke <egyszeregy@freemail.hu>
> 
> - Adjust tab indents
> - Fix format of #define macros

I don't really understand why it'd be important to use parentheses around 
plain constant values in macros. The kernel coding style does not list it 
as a requirement, see 12) 4. in Documentation/process/coding-style.rst.

Best regards,
Jozsef
 
> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
> ---
>  include/uapi/linux/netfilter/xt_dscp.h      | 6 +++---
>  include/uapi/linux/netfilter/xt_rateest.h   | 4 ++--
>  include/uapi/linux/netfilter/xt_tcpmss.h    | 6 +++---
>  include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 8 ++++----
>  include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 3 +--
>  include/uapi/linux/netfilter_ipv6/ip6t_hl.h | 3 +--
>  6 files changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
> index bcfe4afa6351..22b6488ef2e7 100644
> --- a/include/uapi/linux/netfilter/xt_dscp.h
> +++ b/include/uapi/linux/netfilter/xt_dscp.h
> @@ -15,9 +15,9 @@
>  
>  #include <linux/types.h>
>  
> -#define XT_DSCP_MASK	0xfc	/* 11111100 */
> -#define XT_DSCP_SHIFT	2
> -#define XT_DSCP_MAX	0x3f	/* 00111111 */
> +#define XT_DSCP_MASK	(0xfc)	/* 11111100 */
> +#define XT_DSCP_SHIFT	(2)
> +#define XT_DSCP_MAX		(0x3f)	/* 00111111 */
>  
>  /* match info */
>  struct xt_dscp_info {
> diff --git a/include/uapi/linux/netfilter/xt_rateest.h b/include/uapi/linux/netfilter/xt_rateest.h
> index da9727fa527b..f719bd501d1a 100644
> --- a/include/uapi/linux/netfilter/xt_rateest.h
> +++ b/include/uapi/linux/netfilter/xt_rateest.h
> @@ -22,8 +22,8 @@ enum xt_rateest_match_mode {
>  };
>  
>  struct xt_rateest_match_info {
> -	char			name1[IFNAMSIZ];
> -	char			name2[IFNAMSIZ];
> +	char		name1[IFNAMSIZ];
> +	char		name2[IFNAMSIZ];
>  	__u16		flags;
>  	__u16		mode;
>  	__u32		bps1;
> diff --git a/include/uapi/linux/netfilter/xt_tcpmss.h b/include/uapi/linux/netfilter/xt_tcpmss.h
> index 3ee4acaa6e03..ad858ae93e6a 100644
> --- a/include/uapi/linux/netfilter/xt_tcpmss.h
> +++ b/include/uapi/linux/netfilter/xt_tcpmss.h
> @@ -4,11 +4,11 @@
>  
>  #include <linux/types.h>
>  
> -#define XT_TCPMSS_CLAMP_PMTU	0xffff
> +#define XT_TCPMSS_CLAMP_PMTU	(0xffff)
>  
>  struct xt_tcpmss_match_info {
> -    __u16 mss_min, mss_max;
> -    __u8 invert;
> +	__u16 mss_min, mss_max;
> +	__u8 invert;
>  };
>  
>  struct xt_tcpmss_info {
> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> index a6d479aece21..0594dd49d13f 100644
> --- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> @@ -16,10 +16,10 @@
>  
>  #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
> +#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,
> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
> index c21eb6651353..15c75a4ba355 100644
> --- a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
> @@ -9,13 +9,12 @@
>  #include <linux/types.h>
>  
>  enum {
> -	IPT_TTL_EQ = 0,		/* equals */
> +	IPT_TTL_EQ = 0,	/* equals */
>  	IPT_TTL_NE,		/* not equals */
>  	IPT_TTL_LT,		/* less than */
>  	IPT_TTL_GT,		/* greater than */
>  };
>  
> -
>  struct ipt_ttl_info {
>  	__u8	mode;
>  	__u8	ttl;
> diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
> index caef38a63b8f..4af05c86dcd5 100644
> --- a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
> +++ b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
> @@ -9,13 +9,12 @@
>  #include <linux/types.h>
>  
>  enum {
> -	IP6T_HL_EQ = 0,		/* equals */
> +	IP6T_HL_EQ = 0,	/* equals */
>  	IP6T_HL_NE,		/* not equals */
>  	IP6T_HL_LT,		/* less than */
>  	IP6T_HL_GT,		/* greater than */
>  };
>  
> -
>  struct ip6t_hl_info {
>  	__u8	mode;
>  	__u8	hop_limit;
> -- 
> 2.43.5
> 
> 

-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 4735 bytes --]

On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:

> From: Benjamin Szőke <egyszeregy@freemail.hu>
> 
> Display information about deprecated xt_*.h, ipt_*.h files
> at compile time. Recommended to use header files with
> lowercase name format in the future.

I still don't know whether adding the pragmas to notify about header file
deprecation is a good idea.

On my part that's all. Thank you the work!

Best regards,
Jozsef
 
> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
> ---
>  include/uapi/linux/netfilter/xt_CONNMARK.h  | 2 ++
>  include/uapi/linux/netfilter/xt_DSCP.h      | 2 ++
>  include/uapi/linux/netfilter/xt_MARK.h      | 2 ++
>  include/uapi/linux/netfilter/xt_RATEEST.h   | 2 ++
>  include/uapi/linux/netfilter/xt_TCPMSS.h    | 2 ++
>  include/uapi/linux/netfilter_ipv4/ipt_ECN.h | 2 ++
>  include/uapi/linux/netfilter_ipv4/ipt_TTL.h | 2 ++
>  include/uapi/linux/netfilter_ipv6/ip6t_HL.h | 2 ++
>  8 files changed, 16 insertions(+)
> 
> diff --git a/include/uapi/linux/netfilter/xt_CONNMARK.h b/include/uapi/linux/netfilter/xt_CONNMARK.h
> index 171af24ef679..1bc991fd546a 100644
> --- a/include/uapi/linux/netfilter/xt_CONNMARK.h
> +++ b/include/uapi/linux/netfilter/xt_CONNMARK.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter/xt_connmark.h>
>  
> +#pragma message("xt_CONNMARK.h header is deprecated. Use xt_connmark.h instead.")
> +
>  #endif /* _XT_CONNMARK_TARGET_H */
> diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
> index fcff72347256..bd550292803d 100644
> --- a/include/uapi/linux/netfilter/xt_DSCP.h
> +++ b/include/uapi/linux/netfilter/xt_DSCP.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter/xt_dscp.h>
>  
> +#pragma message("xt_DSCP.h header is deprecated. Use xt_dscp.h instead.")
> +
>  #endif /* _XT_DSCP_TARGET_H */
> diff --git a/include/uapi/linux/netfilter/xt_MARK.h b/include/uapi/linux/netfilter/xt_MARK.h
> index cdc12c0954b3..9f6c03e26c96 100644
> --- a/include/uapi/linux/netfilter/xt_MARK.h
> +++ b/include/uapi/linux/netfilter/xt_MARK.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter/xt_mark.h>
>  
> +#pragma message("xt_MARK.h header is deprecated. Use xt_mark.h instead.")
> +
>  #endif /* _XT_MARK_H_TARGET_H */
> diff --git a/include/uapi/linux/netfilter/xt_RATEEST.h b/include/uapi/linux/netfilter/xt_RATEEST.h
> index f817b5387164..ec3d68f67b2f 100644
> --- a/include/uapi/linux/netfilter/xt_RATEEST.h
> +++ b/include/uapi/linux/netfilter/xt_RATEEST.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter/xt_rateest.h>
>  
> +#pragma message("xt_RATEEST.h header is deprecated. Use xt_rateest.h instead.")
> +
>  #endif /* _XT_RATEEST_TARGET_H */
> diff --git a/include/uapi/linux/netfilter/xt_TCPMSS.h b/include/uapi/linux/netfilter/xt_TCPMSS.h
> index 154e88c1de02..826060264766 100644
> --- a/include/uapi/linux/netfilter/xt_TCPMSS.h
> +++ b/include/uapi/linux/netfilter/xt_TCPMSS.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter/xt_tcpmss.h>
>  
> +#pragma message("xt_TCPMSS.h header is deprecated. Use xt_tcpmss.h instead.")
> +
>  #endif /* _XT_TCPMSS_TARGET_H */
> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> index 6727f5a44512..42317fb3a4e9 100644
> --- a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter_ipv4/ipt_ecn.h>
>  
> +#pragma message("ipt_ECN.h header is deprecated. Use ipt_ecn.h instead.")
> +
>  #endif /* _IPT_ECN_TARGET_H */
> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
> index 5d989199ed28..1663493e4951 100644
> --- a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter_ipv4/ipt_ttl.h>
>  
> +#pragma message("ipt_TTL.h header is deprecated. Use ipt_ttl.h instead.")
> +
>  #endif /* _IPT_TTL_TARGET_H */
> diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
> index bcf22824b393..55f08e20acd2 100644
> --- a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
> +++ b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
> @@ -4,4 +4,6 @@
>  
>  #include <linux/netfilter_ipv6/ip6t_hl.h>
>  
> +#pragma message("ip6t_HL.h header is deprecated. Use ip6t_hl.h instead.")
> +
>  #endif /* _IP6T_HL_TARGET_H */
> -- 
> 2.43.5
> 
> 

-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Szőke Benjamin]

2025. 01. 07. 20:23 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> 
>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>
>> Merge xt_DSCP.h to xt_dscp.h header file.
> 
> I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h
> header file." (and in the other patches as well).
>   

There will be no any new patchset refactoring anymore just of some cosmetics 
change. If you like to change it, feel free to modify it in my pacthfiles before 
the final merging. You can do it as a maintainer.

>> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
>> ---
>>   include/uapi/linux/netfilter/xt_DSCP.h | 22 +---------------------
>>   include/uapi/linux/netfilter/xt_dscp.h | 20 ++++++++++++++++----
>>   2 files changed, 17 insertions(+), 25 deletions(-)
>>
>> diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
>> index 223d635e8b6f..fcff72347256 100644
>> --- a/include/uapi/linux/netfilter/xt_DSCP.h
>> +++ b/include/uapi/linux/netfilter/xt_DSCP.h
>> @@ -1,27 +1,7 @@
>>   /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>> -/* x_tables module for setting the IPv4/IPv6 DSCP field
>> - *
>> - * (C) 2002 Harald Welte <laforge@gnumonks.org>
>> - * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
>> - * This software is distributed under GNU GPL v2, 1991
>> - *
>> - * See RFC2474 for a description of the DSCP field within the IP Header.
>> - *
>> - * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
>> -*/
>>   #ifndef _XT_DSCP_TARGET_H
>>   #define _XT_DSCP_TARGET_H
>> -#include <linux/netfilter/xt_dscp.h>
>> -#include <linux/types.h>
>> -
>> -/* target info */
>> -struct xt_DSCP_info {
>> -	__u8 dscp;
>> -};
>>   
>> -struct xt_tos_target_info {
>> -	__u8 tos_value;
>> -	__u8 tos_mask;
>> -};
>> +#include <linux/netfilter/xt_dscp.h>
>>   
>>   #endif /* _XT_DSCP_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
>> index 7594e4df8587..bcfe4afa6351 100644
>> --- a/include/uapi/linux/netfilter/xt_dscp.h
>> +++ b/include/uapi/linux/netfilter/xt_dscp.h
>> @@ -1,15 +1,17 @@
>>   /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>> -/* x_tables module for matching the IPv4/IPv6 DSCP field
>> +/* x_tables module for matching/modifying the IPv4/IPv6 DSCP field
>>    *
>>    * (C) 2002 Harald Welte <laforge@gnumonks.org>
>> + * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
>>    * This software is distributed under GNU GPL v2, 1991
>>    *
>>    * See RFC2474 for a description of the DSCP field within the IP Header.
>>    *
>> + * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
>>    * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
>>   */
> 
> For the sake of history it'd worth to prepend the last two lines with
> something like: "Original version informations before merging the contents
> of the files:"
> 
This was a question a day ago, what do you like to see in each top of header 
files's comments. You did not care about it, you was not willing to say 
something which to be implemented, but now you have new ideas, please it is too 
late.

I will not plan to make any new patchset version just for this new thing which 
is just a cosmetic change not a critical bugfix. If you like to change it, lets 
do it, feel free to modify it in my pacthfiles before the final merging or apply 
your a new patch later.


>> -#ifndef _XT_DSCP_H
>> -#define _XT_DSCP_H
>> +#ifndef _UAPI_XT_DSCP_H
>> +#define _UAPI_XT_DSCP_H
> 
> In the first four patches you added the _UAPI_ prefix to the header
> guards while in the next three ones you kept the original ones. Please
> use one style consistently.
> 

Style consistently is done in the following files:

- All of xt_*.h files in uppercase name format (old headers for "target")
- All of xt_*.h files in lowercase name format (merged header files)

Originally, in these files there was a chaotic state before, it was a painful 
for my eyes, this is why they got these changes. In ipt_*.h files the original 
codes got a far enough consistently style before, they was not changed.

In my patchsets, It's not my scope/job to make up for the 
improvements/refactoring of the last 10 years.

>>   #include <linux/types.h>
>>   
>> @@ -29,4 +31,14 @@ struct xt_tos_match_info {
>>   	__u8 invert;
>>   };
>>   
>> -#endif /* _XT_DSCP_H */
>> +/* target info */
>> +struct xt_DSCP_info {
>> +	__u8 dscp;
>> +};
>> +
>> +struct xt_tos_target_info {
>> +	__u8 tos_value;
>> +	__u8 tos_mask;
>> +};
>> +
>> +#endif /* _UAPI_XT_DSCP_H */
>> -- 
>> 2.43.5
>>
>>
> 
> Best regards,
> Jozsef

Re: [PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h

[Szőke Benjamin]

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

Re: [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files.

[Szőke Benjamin]

2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> 
>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>
>> - Adjust tab indents
>> - Fix format of #define macros
> 
> I don't really understand why it'd be important to use parentheses around
> plain constant values in macros. The kernel coding style does not list it
> as a requirement, see 12) 4. in Documentation/process/coding-style.rst.
> 

If it would be more than just a const value, parentheses is a must have thing 
for it (now for it, it is not critical to have it but better to get used to 
this). This is how my hand automatically do it, to avoid the syntax problem in 
this coding.

> Best regards,
> Jozsef
>   
>> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
>> ---
>>   include/uapi/linux/netfilter/xt_dscp.h      | 6 +++---
>>   include/uapi/linux/netfilter/xt_rateest.h   | 4 ++--
>>   include/uapi/linux/netfilter/xt_tcpmss.h    | 6 +++---
>>   include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 8 ++++----
>>   include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 3 +--
>>   include/uapi/linux/netfilter_ipv6/ip6t_hl.h | 3 +--
>>   6 files changed, 14 insertions(+), 16 deletions(-)
>>
>> diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
>> index bcfe4afa6351..22b6488ef2e7 100644
>> --- a/include/uapi/linux/netfilter/xt_dscp.h
>> +++ b/include/uapi/linux/netfilter/xt_dscp.h
>> @@ -15,9 +15,9 @@
>>   
>>   #include <linux/types.h>
>>   
>> -#define XT_DSCP_MASK	0xfc	/* 11111100 */
>> -#define XT_DSCP_SHIFT	2
>> -#define XT_DSCP_MAX	0x3f	/* 00111111 */
>> +#define XT_DSCP_MASK	(0xfc)	/* 11111100 */
>> +#define XT_DSCP_SHIFT	(2)
>> +#define XT_DSCP_MAX		(0x3f)	/* 00111111 */
>>   
>>   /* match info */
>>   struct xt_dscp_info {
>> diff --git a/include/uapi/linux/netfilter/xt_rateest.h b/include/uapi/linux/netfilter/xt_rateest.h
>> index da9727fa527b..f719bd501d1a 100644
>> --- a/include/uapi/linux/netfilter/xt_rateest.h
>> +++ b/include/uapi/linux/netfilter/xt_rateest.h
>> @@ -22,8 +22,8 @@ enum xt_rateest_match_mode {
>>   };
>>   
>>   struct xt_rateest_match_info {
>> -	char			name1[IFNAMSIZ];
>> -	char			name2[IFNAMSIZ];
>> +	char		name1[IFNAMSIZ];
>> +	char		name2[IFNAMSIZ];
>>   	__u16		flags;
>>   	__u16		mode;
>>   	__u32		bps1;
>> diff --git a/include/uapi/linux/netfilter/xt_tcpmss.h b/include/uapi/linux/netfilter/xt_tcpmss.h
>> index 3ee4acaa6e03..ad858ae93e6a 100644
>> --- a/include/uapi/linux/netfilter/xt_tcpmss.h
>> +++ b/include/uapi/linux/netfilter/xt_tcpmss.h
>> @@ -4,11 +4,11 @@
>>   
>>   #include <linux/types.h>
>>   
>> -#define XT_TCPMSS_CLAMP_PMTU	0xffff
>> +#define XT_TCPMSS_CLAMP_PMTU	(0xffff)
>>   
>>   struct xt_tcpmss_match_info {
>> -    __u16 mss_min, mss_max;
>> -    __u8 invert;
>> +	__u16 mss_min, mss_max;
>> +	__u8 invert;
>>   };
>>   
>>   struct xt_tcpmss_info {
>> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
>> index a6d479aece21..0594dd49d13f 100644
>> --- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
>> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
>> @@ -16,10 +16,10 @@
>>   
>>   #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
>> +#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,
>> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
>> index c21eb6651353..15c75a4ba355 100644
>> --- a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
>> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
>> @@ -9,13 +9,12 @@
>>   #include <linux/types.h>
>>   
>>   enum {
>> -	IPT_TTL_EQ = 0,		/* equals */
>> +	IPT_TTL_EQ = 0,	/* equals */
>>   	IPT_TTL_NE,		/* not equals */
>>   	IPT_TTL_LT,		/* less than */
>>   	IPT_TTL_GT,		/* greater than */
>>   };
>>   
>> -
>>   struct ipt_ttl_info {
>>   	__u8	mode;
>>   	__u8	ttl;
>> diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
>> index caef38a63b8f..4af05c86dcd5 100644
>> --- a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
>> +++ b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
>> @@ -9,13 +9,12 @@
>>   #include <linux/types.h>
>>   
>>   enum {
>> -	IP6T_HL_EQ = 0,		/* equals */
>> +	IP6T_HL_EQ = 0,	/* equals */
>>   	IP6T_HL_NE,		/* not equals */
>>   	IP6T_HL_LT,		/* less than */
>>   	IP6T_HL_GT,		/* greater than */
>>   };
>>   
>> -
>>   struct ip6t_hl_info {
>>   	__u8	mode;
>>   	__u8	hop_limit;
>> -- 
>> 2.43.5
>>
>>
> 

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Szőke Benjamin]

2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> 
>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>
>> Display information about deprecated xt_*.h, ipt_*.h files
>> at compile time. Recommended to use header files with
>> lowercase name format in the future.
> 
> I still don't know whether adding the pragmas to notify about header file
> deprecation is a good idea.
> 

Do you have any other ideas how can you display this information to the 
users/customers, that it is time to stop using the uppercase header files then 
they shall to use its merged lowercase named files instead in their userspace SW?

> On my part that's all. Thank you the work!
> 
> Best regards,
> Jozsef
>   
>> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
>> ---
>>   include/uapi/linux/netfilter/xt_CONNMARK.h  | 2 ++
>>   include/uapi/linux/netfilter/xt_DSCP.h      | 2 ++
>>   include/uapi/linux/netfilter/xt_MARK.h      | 2 ++
>>   include/uapi/linux/netfilter/xt_RATEEST.h   | 2 ++
>>   include/uapi/linux/netfilter/xt_TCPMSS.h    | 2 ++
>>   include/uapi/linux/netfilter_ipv4/ipt_ECN.h | 2 ++
>>   include/uapi/linux/netfilter_ipv4/ipt_TTL.h | 2 ++
>>   include/uapi/linux/netfilter_ipv6/ip6t_HL.h | 2 ++
>>   8 files changed, 16 insertions(+)
>>
>> diff --git a/include/uapi/linux/netfilter/xt_CONNMARK.h b/include/uapi/linux/netfilter/xt_CONNMARK.h
>> index 171af24ef679..1bc991fd546a 100644
>> --- a/include/uapi/linux/netfilter/xt_CONNMARK.h
>> +++ b/include/uapi/linux/netfilter/xt_CONNMARK.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter/xt_connmark.h>
>>   
>> +#pragma message("xt_CONNMARK.h header is deprecated. Use xt_connmark.h instead.")
>> +
>>   #endif /* _XT_CONNMARK_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
>> index fcff72347256..bd550292803d 100644
>> --- a/include/uapi/linux/netfilter/xt_DSCP.h
>> +++ b/include/uapi/linux/netfilter/xt_DSCP.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter/xt_dscp.h>
>>   
>> +#pragma message("xt_DSCP.h header is deprecated. Use xt_dscp.h instead.")
>> +
>>   #endif /* _XT_DSCP_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter/xt_MARK.h b/include/uapi/linux/netfilter/xt_MARK.h
>> index cdc12c0954b3..9f6c03e26c96 100644
>> --- a/include/uapi/linux/netfilter/xt_MARK.h
>> +++ b/include/uapi/linux/netfilter/xt_MARK.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter/xt_mark.h>
>>   
>> +#pragma message("xt_MARK.h header is deprecated. Use xt_mark.h instead.")
>> +
>>   #endif /* _XT_MARK_H_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter/xt_RATEEST.h b/include/uapi/linux/netfilter/xt_RATEEST.h
>> index f817b5387164..ec3d68f67b2f 100644
>> --- a/include/uapi/linux/netfilter/xt_RATEEST.h
>> +++ b/include/uapi/linux/netfilter/xt_RATEEST.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter/xt_rateest.h>
>>   
>> +#pragma message("xt_RATEEST.h header is deprecated. Use xt_rateest.h instead.")
>> +
>>   #endif /* _XT_RATEEST_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter/xt_TCPMSS.h b/include/uapi/linux/netfilter/xt_TCPMSS.h
>> index 154e88c1de02..826060264766 100644
>> --- a/include/uapi/linux/netfilter/xt_TCPMSS.h
>> +++ b/include/uapi/linux/netfilter/xt_TCPMSS.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter/xt_tcpmss.h>
>>   
>> +#pragma message("xt_TCPMSS.h header is deprecated. Use xt_tcpmss.h instead.")
>> +
>>   #endif /* _XT_TCPMSS_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
>> index 6727f5a44512..42317fb3a4e9 100644
>> --- a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
>> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter_ipv4/ipt_ecn.h>
>>   
>> +#pragma message("ipt_ECN.h header is deprecated. Use ipt_ecn.h instead.")
>> +
>>   #endif /* _IPT_ECN_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
>> index 5d989199ed28..1663493e4951 100644
>> --- a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
>> +++ b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter_ipv4/ipt_ttl.h>
>>   
>> +#pragma message("ipt_TTL.h header is deprecated. Use ipt_ttl.h instead.")
>> +
>>   #endif /* _IPT_TTL_TARGET_H */
>> diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
>> index bcf22824b393..55f08e20acd2 100644
>> --- a/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
>> +++ b/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
>> @@ -4,4 +4,6 @@
>>   
>>   #include <linux/netfilter_ipv6/ip6t_hl.h>
>>   
>> +#pragma message("ip6t_HL.h header is deprecated. Use ip6t_hl.h instead.")
>> +
>>   #endif /* _IP6T_HL_TARGET_H */
>> -- 
>> 2.43.5
>>
>>
> 

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Jan Engelhardt]

On Tuesday 2025-01-07 23:06, Szőke Benjamin wrote:
>> 
>> I still don't know whether adding the pragmas to notify about header file
>> deprecation is a good idea.
>
> Do you have any other ideas how can you display this information to the
> users/customers, that it is time to stop using the uppercase header files then
> they shall to use its merged lowercase named files instead in their userspace
> SW?

``__attribute__`` is just as implementation-specific as ``#pragma``, so it's
not really an improvement, but here goes:

----
struct __attribute__((deprecated("This header file is deprecated"))) dontusethisstruct {
};
extern struct dontusethisstruct undefinedstruct;
----

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Szőke Benjamin]

2025. 01. 07. 23:38 keltezéssel, Jan Engelhardt írta:
> 
> On Tuesday 2025-01-07 23:06, Szőke Benjamin wrote:
>>>
>>> I still don't know whether adding the pragmas to notify about header file
>>> deprecation is a good idea.
>>
>> Do you have any other ideas how can you display this information to the
>> users/customers, that it is time to stop using the uppercase header files then
>> they shall to use its merged lowercase named files instead in their userspace
>> SW?
> 
> ``__attribute__`` is just as implementation-specific as ``#pragma``, so it's
> not really an improvement, but here goes:
> 
> ----
> struct __attribute__((deprecated("This header file is deprecated"))) dontusethisstruct {
> };
> extern struct dontusethisstruct undefinedstruct;
> ----

As i know it is a feature only in GCC, can it work with Clang compiler?
https://renenyffenegger.ch/notes/development/languages/C-C-plus-plus/GCC/__attribute__/deprecated/index

By the way it is perfect for through a warning for a deprecated struct, function 
etc ... only in GCC, but it is not ideal to use a simple header file include and 
the syntax of it is horryble. Usage of a generic #pragma message is more 
feasible in all compilers.

Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 2654 bytes --]

On Tue, 7 Jan 2025, Szőke Benjamin wrote:

> 2025. 01. 07. 20:23 keltezéssel, Jozsef Kadlecsik írta:
> > On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> > 
> > > From: Benjamin Szőke <egyszeregy@freemail.hu>
> > > 
> > > Merge xt_DSCP.h to xt_dscp.h header file.
> > 
> > I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h 
> > header file." (and in the other patches as well).
> 
> There will be no any new patchset refactoring anymore just of some 
> cosmetics change. If you like to change it, feel free to modify it in my 
> pacthfiles before the final merging. You can do it as a maintainer.

We don't modify accepted patches. It rarely happens when time presses and 
even in that case it is discussed publicly: "sorry, no time to wait for 
*you* to respin your patch, so I'm going to fix this part, OK?"

But there's no time constrain here. So it'd be strange at the minimum if 
your submitted patches were modified by a maintainer at merging.

Believe it or not, I'm just trying to help to get your patches into the 
best shape.
 
> > > -#ifndef _XT_DSCP_H
> > > -#define _XT_DSCP_H
> > > +#ifndef _UAPI_XT_DSCP_H
> > > +#define _UAPI_XT_DSCP_H
> > 
> > In the first four patches you added the _UAPI_ prefix to the header 
> > guards while in the next three ones you kept the original ones. Please 
> > use one style consistently.
>
> Style consistently is done in the following files:
> 
> - All of xt_*.h files in uppercase name format (old headers for "target")
> - All of xt_*.h files in lowercase name format (merged header files)
> 
> Originally, in these files there was a chaotic state before, it was a 
> painful for my eyes, this is why they got these changes. In ipt_*.h 
> files the original codes got a far enough consistently style before, 
> they was not changed.
> 
> In my patchsets, It's not my scope/job to make up for the
> improvements/refactoring of the last 10 years.

But you are just introducing new inconsistencies: 

--- a/include/uapi/linux/netfilter/xt_dscp.h
+++ b/include/uapi/linux/netfilter/xt_dscp.h
...
-#ifndef _XT_DSCP_H
-#define _XT_DSCP_H
+#ifndef _UAPI_XT_DSCP_H
+#define _UAPI_XT_DSCP_H

however

--- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
+++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
...
 #ifndef _IPT_ECN_H
 #define _IPT_ECN_H

Why the "_UAPI_" prefixes are needed in the xt_*.h header files?

Best regards,
Jozsef
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 2364 bytes --]

On Tue, 7 Jan 2025, Szőke Benjamin wrote:

> 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,
>   ^~~~~~~~~~~~~~~

Yes, you are right: from the patches themselves the duplicate macro/enum 
definition of IPT_ECN_IP_MASK were not evident.

Best regards,
Jozsef
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files.

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]

On Tue, 7 Jan 2025, Szőke Benjamin wrote:

> 2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
> > On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> > 
> > > From: Benjamin Szőke <egyszeregy@freemail.hu>
> > > 
> > > - Adjust tab indents
> > > - Fix format of #define macros
> > 
> > I don't really understand why it'd be important to use parentheses 
> > around plain constant values in macros. The kernel coding style does 
> > not list it as a requirement, see 12) 4. in 
> > Documentation/process/coding-style.rst.
> 
> If it would be more than just a const value, parentheses is a must have 
> thing for it (now for it, it is not critical to have it but better to 
> get used to this). This is how my hand automatically do it, to avoid the 
> syntax problem in this coding.

Are you going to "fix" this "issue" in the whole kernel tree?

If yes, then please propose changes to the coding style documentation as 
well.

If no, then please keep the macros as is because the changes would just 
introduce more different kind of notations in the source tree.

Best regards,
Jozsef
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]

On Tue, 7 Jan 2025, Szőke Benjamin wrote:

> 2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
> > On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
> > 
> > > From: Benjamin Szőke <egyszeregy@freemail.hu>
> > > 
> > > Display information about deprecated xt_*.h, ipt_*.h files
> > > at compile time. Recommended to use header files with
> > > lowercase name format in the future.
> > 
> > I still don't know whether adding the pragmas to notify about header 
> > file deprecation is a good idea.
> 
> Do you have any other ideas how can you display this information to the 
> users/customers, that it is time to stop using the uppercase header 
> files then they shall to use its merged lowercase named files instead in 
> their userspace SW?

Honestly, I don't know. What about Jan's clever idea of having the 
clashing filenames with identical content, i.e.

ipt_ttl.h:
#ifndef _IPT_TTL_H
#define _IPT_TTL_H
#include <linux/netfilter_ipv4/ipt_ttl_common.h>
#endif _IPT_TTL_H

ipt_TTL.h:
#ifndef _IPT_TTL_H
#define _IPT_TTL_H
#include <linux/netfilter_ipv4/ipt_ttl_common.h>
#endif _IPT_TTL_H

Would cloning such a repo on a case-insensitive filesystem produce errors 
or would work just fine?

Best regards,
Jozsef
-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary

Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Szőke Benjamin]

2025. 01. 08. 21:11 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, Szőke Benjamin wrote:
> 
>> 2025. 01. 07. 20:23 keltezéssel, Jozsef Kadlecsik írta:
>>> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
>>>
>>>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>>>
>>>> Merge xt_DSCP.h to xt_dscp.h header file.
>>>
>>> I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h
>>> header file." (and in the other patches as well).
>>
>> There will be no any new patchset refactoring anymore just of some
>> cosmetics change. If you like to change it, feel free to modify it in my
>> pacthfiles before the final merging. You can do it as a maintainer.
> 
> We don't modify accepted patches. It rarely happens when time presses and
> even in that case it is discussed publicly: "sorry, no time to wait for
> *you* to respin your patch, so I'm going to fix this part, OK?"
> 
> But there's no time constrain here. So it'd be strange at the minimum if
> your submitted patches were modified by a maintainer at merging.
> 
> Believe it or not, I'm just trying to help to get your patches into the
> best shape.
>   

Holyday session is end, i have no time to refactoring and regenerate my patchset 
in every day, because you have a new idea about cosmetics changes in every next 
days. (this is why asked you before what you like to get, there was no any answer)
If you feel it is need, you can solve it as a maintainer, i know. If you found 
any critical issue i can fix it later, please start to look for them, but i will 
not waste my time with this usless commit name and header comment changes, 
sorry. It is a hobby, i am not a paied Linux developer which is supported by a 
company for this stuff.

As a maintainer you can solve this cosmetics things later in an extra patch or 
before the merging, lets do it.

>>>> -#ifndef _XT_DSCP_H
>>>> -#define _XT_DSCP_H
>>>> +#ifndef _UAPI_XT_DSCP_H
>>>> +#define _UAPI_XT_DSCP_H
>>>
>>> In the first four patches you added the _UAPI_ prefix to the header
>>> guards while in the next three ones you kept the original ones. Please
>>> use one style consistently.
>>
>> Style consistently is done in the following files:
>>
>> - All of xt_*.h files in uppercase name format (old headers for "target")
>> - All of xt_*.h files in lowercase name format (merged header files)
>>
>> Originally, in these files there was a chaotic state before, it was a
>> painful for my eyes, this is why they got these changes. In ipt_*.h
>> files the original codes got a far enough consistently style before,
>> they was not changed.
>>
>> In my patchsets, It's not my scope/job to make up for the
>> improvements/refactoring of the last 10 years.
> 
> But you are just introducing new inconsistencies:
> 
> --- a/include/uapi/linux/netfilter/xt_dscp.h
> +++ b/include/uapi/linux/netfilter/xt_dscp.h
> ...
> -#ifndef _XT_DSCP_H
> -#define _XT_DSCP_H
> +#ifndef _UAPI_XT_DSCP_H
> +#define _UAPI_XT_DSCP_H
> 
> however
> 
> --- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> ...
>   #ifndef _IPT_ECN_H
>   #define _IPT_ECN_H
> 
> Why the "_UAPI_" prefixes are needed in the xt_*.h header files?
> 

Because it is in the UAPI region, don't you hear about the namespace? It is not 
only relevant for OOP languages.
https://www.educative.io/answers/what-is-a-namespace

Here is a good any nice example which also got _UAPI prefix in Linux kernel 
source: 
https://github.com/torvalds/linux/blob/master/include/uapi/linux/iio/buffer.h

By the way, in the API folder, all header should have have had a prefix 
otherwise it can cause conflict with a same non-uapi header like these:
include/net/netfilter
/xt_rateest.h -> 
https://github.com/torvalds/linux/blob/master/include/net/netfilter/xt_rateest.h
include/uapi/linux/netfilter
/xt_rateest.h -> 
https://github.com/torvalds/linux/blob/master/include/uapi/linux/netfilter/xt_rateest.h

In ipt_*.h, include guards are consistent (where i did any changes) but sure 
they should have to got that _UAPI prefix also. But this is not the scpoe in my 
patch, to rafectoring the full netfilter part of the UAPI in Linux, sorry. 
Please sit down and do it as a maintainer, there were no any relevant 
refactoring in the past 10 years in this code parts.

> Best regards,
> Jozsef

Re: [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files.

[Szőke Benjamin]

2025. 01. 08. 21:20 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, Szőke Benjamin wrote:
> 
>> 2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
>>> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
>>>
>>>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>>>
>>>> - Adjust tab indents
>>>> - Fix format of #define macros
>>>
>>> I don't really understand why it'd be important to use parentheses
>>> around plain constant values in macros. The kernel coding style does
>>> not list it as a requirement, see 12) 4. in
>>> Documentation/process/coding-style.rst.
>>
>> If it would be more than just a const value, parentheses is a must have
>> thing for it (now for it, it is not critical to have it but better to
>> get used to this). This is how my hand automatically do it, to avoid the
>> syntax problem in this coding.
> 
> Are you going to "fix" this "issue" in the whole kernel tree?
> 
> If yes, then please propose changes to the coding style documentation as
> well.
> 
> If no, then please keep the macros as is because the changes would just
> introduce more different kind of notations in the source tree.
> 

I will keep it, sorry. It it not provide any different notation. It is just a 
parentheses for safe and defensive programming, it is not bad.

> Best regards,
> Jozsef

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Szőke Benjamin]

2025. 01. 08. 21:51 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, Szőke Benjamin wrote:
> 
>> 2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
>>> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
>>>
>>>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>>>
>>>> Display information about deprecated xt_*.h, ipt_*.h files
>>>> at compile time. Recommended to use header files with
>>>> lowercase name format in the future.
>>>
>>> I still don't know whether adding the pragmas to notify about header
>>> file deprecation is a good idea.
>>
>> Do you have any other ideas how can you display this information to the
>> users/customers, that it is time to stop using the uppercase header
>> files then they shall to use its merged lowercase named files instead in
>> their userspace SW?
> 
> Honestly, I don't know. What about Jan's clever idea of having the
> clashing filenames with identical content, i.e.
> 
> ipt_ttl.h:
> #ifndef _IPT_TTL_H
> #define _IPT_TTL_H
> #include <linux/netfilter_ipv4/ipt_ttl_common.h>
> #endif _IPT_TTL_H
> 
> ipt_TTL.h:
> #ifndef _IPT_TTL_H
> #define _IPT_TTL_H
> #include <linux/netfilter_ipv4/ipt_ttl_common.h>
> #endif _IPT_TTL_H
> 
> Would cloning such a repo on a case-insensitive filesystem produce errors
> or would work just fine?
> 

What is this suggestion, in ipt_ttl.h and ipt_TTL.h really? How it can solve and 
provide in compile or run-time information for the users about the recomendded 
changes? (It seems to me that you are completely misunderstanding the purpose of 
this message at this time.)


Listen carefully, this are the points/scope.

This patchset provide the following:
- 1. Merge upper and lowercase named haeder files in UAPI netfilter.
- 2. Merge upper and lowercase named source files in UAPI netfilter. (uppercase 
named files can be removed)
- 3. Keep the backward compatibility, there is no any breaking API changes yet.
- 4. Keep uppercase header files as just a "wrapper" for include same lowercase 
header files.
- 5. Provide a clear message for the UAPI's users that in the future should have 
to use the lowercase named files instead.

Later, for example when Linux kernel goes to 7.0 version, uppercase header files 
can be removed. Breaking API possibble when version of a SW is incremented in 
major field. Before, in first patchset, UAPI users were informed about what is 
better to use. So it can be a clear and slow roadmap to solve case-insensitive 
filesystem issue on this files.


> Best regards,
> Jozsef

Re: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h.

[Przemek Kitszel]

On 1/8/25 22:38, Szőke Benjamin wrote:
> 2025. 01. 08. 21:51 keltezéssel, Jozsef Kadlecsik írta:
>> On Tue, 7 Jan 2025, Szőke Benjamin wrote:
>>
>>> 2025. 01. 07. 20:39 keltezéssel, Jozsef Kadlecsik írta:
>>>> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
>>>>
>>>>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>>>>
>>>>> Display information about deprecated xt_*.h, ipt_*.h files
>>>>> at compile time. Recommended to use header files with
>>>>> lowercase name format in the future.
>>>>
>>>> I still don't know whether adding the pragmas to notify about header
>>>> file deprecation is a good idea.
>>>
>>> Do you have any other ideas how can you display this information to the
>>> users/customers, that it is time to stop using the uppercase header
>>> files then they shall to use its merged lowercase named files instead in
>>> their userspace SW?
>>
>> Honestly, I don't know. What about Jan's clever idea of having the
>> clashing filenames with identical content, i.e.
>>
>> ipt_ttl.h:
>> #ifndef _IPT_TTL_H
>> #define _IPT_TTL_H
>> #include <linux/netfilter_ipv4/ipt_ttl_common.h>
>> #endif _IPT_TTL_H
>>
>> ipt_TTL.h:
>> #ifndef _IPT_TTL_H
>> #define _IPT_TTL_H
>> #include <linux/netfilter_ipv4/ipt_ttl_common.h>
>> #endif _IPT_TTL_H
>>
>> Would cloning such a repo on a case-insensitive filesystem produce errors
>> or would work just fine?
>>
> 
> What is this suggestion, in ipt_ttl.h and ipt_TTL.h really? How it can 
> solve and provide in compile or run-time information for the users about 
> the recomendded changes? (It seems to me that you are completely 
> misunderstanding the purpose of this message at this time.)

likely the uppercased names will be with us forever

> 
> 
> Listen carefully, this are the points/scope.
> 
> This patchset provide the following:
> - 1. Merge upper and lowercase named haeder files in UAPI netfilter.
> - 2. Merge upper and lowercase named source files in UAPI netfilter. 
> (uppercase named files can be removed)
> - 3. Keep the backward compatibility, there is no any breaking API 
> changes yet.
> - 4. Keep uppercase header files as just a "wrapper" for include same 
> lowercase header files.
> - 5. Provide a clear message for the UAPI's users that in the future 
> should have to use the lowercase named files instead.

6. lot's of drama too.

Please remember to add a proper versioning to your next revision, also
target to net-next.

> 
> Later, for example when Linux kernel goes to 7.0 version, uppercase 
> header files can be removed. Breaking API possibble when version of a SW 
> is incremented in major field. Before, in first patchset, UAPI users 

that would be correct for "semantic versioning", not used by the kernel

> were informed about what is better to use. So it can be a clear and slow 
> roadmap to solve case-insensitive filesystem issue on this files.
> 
> 
>> Best regards,
>> Jozsef
> 
> 

Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Jozsef Kadlecsik]

[-- Attachment #1: Type: text/plain, Size: 2251 bytes --]

On Wed, 8 Jan 2025, Szőke Benjamin wrote:

> 2025. 01. 08. 21:11 keltezéssel, Jozsef Kadlecsik írta:
>> On Tue, 7 Jan 2025, Szőke Benjamin wrote:
>> 
>>> 2025. 01. 07. 20:23 keltezéssel, Jozsef Kadlecsik írta:
>>>> On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:
>>>> 
>>>>> From: Benjamin Szőke <egyszeregy@freemail.hu>
>>>>> 
>>>>> Merge xt_DSCP.h to xt_dscp.h header file.
>>>> 
>>>> I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h
>>>> header file." (and in the other patches as well).
>>> 
>>> There will be no any new patchset refactoring anymore just of some
>>> cosmetics change. If you like to change it, feel free to modify it in my
>>> pacthfiles before the final merging. You can do it as a maintainer.
>> 
>> We don't modify accepted patches. It rarely happens when time presses and
>> even in that case it is discussed publicly: "sorry, no time to wait for
>> *you* to respin your patch, so I'm going to fix this part, OK?"
>> 
>> But there's no time constrain here. So it'd be strange at the minimum if
>> your submitted patches were modified by a maintainer at merging.
>> 
>> Believe it or not, I'm just trying to help to get your patches into the
>> best shape.
>
> Holyday session is end, i have no time to refactoring and regenerate my 
> patchset in every day, because you have a new idea about cosmetics 
> changes in every next days. (this is why asked you before what you like 
> to get, there was no any answer) If you feel it is need, you can solve 
> it as a maintainer, i know. If you found any critical issue i can fix it 
> later, please start to look for them, but i will not waste my time with 
> this usless commit name and header comment changes, sorry. It is a 
> hobby, i am not a paied Linux developer which is supported by a company 
> for this stuff.

Your patches do not fix any bug in the code itself. The unified 
match/target modules would be a good to have for less memory usage but 
it's not pressing either.

So there's no time pressure at all, if you wish/need you can continue to 
improve your patchset when you'll have the time.

Best regards,
Jozsef

Ps: I have been doing my Linux developing/maintenance in my spare time.