From patchwork Tue Jan 7 02:41:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13928006 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DAE8259480; Tue, 7 Jan 2025 02:48:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736218119; cv=none; b=WEK+SB9KtY/rAiwLKEhg63s6Im630mUf9hXBbmQezkCI4gBNFpaa6HkfG71ISt7z99J4AWQeOCzZnJlimFlbeEcPJBMwJFmSzfctYAFEhPgouFWg0Lgjj0PoidIhsL5TkyMMY4dA53VOdEBiRUmEjt7PXLvmP4Ttav/giEqjFyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736218119; c=relaxed/simple; bh=rdcPHPNe0hLoadoCS5UYbHgLAyfHdf06iO5jSPeHY6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RFEiYbLAl7NgK/odMqnaNs2iPzS+sxU+XL2Ve2L4bVP+yiSYqWtcY8zToOHNZzGl1Wm/gXcAaQ5+jJBj7jBRC3b/WVOxusIwVBxrOFSlZK3Cs44N5wocDA/wVjtiic1+e6NzFCkEM3AlkNq1PcraXBA9vhFK5VbVu1P5R+Zy42A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=PBWYVN4S reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="PBWYVN4S" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwKs6YSBzVFC; Tue, 07 Jan 2025 03:41:37 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h Date: Tue, 7 Jan 2025 03:41:11 +0100 Message-ID: <20250107024120.98288-2-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217698; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=2597; bh=EWAJLyrABMXs/j8+j7Qz8fyUpy1qwkK7Tej6Vxp/Cvg=; b=PBWYVN4SyeuxvVMF06MaQUnH4+TV+pFr3EqXBSWewBsyPJwhEXi11+1fX28g8smT WMZ6z8C8MEQDNWyysSivRg7Sn+JSyIV43uwdzpvCt7RG2NTnwNAeJGa877Zui7rOmZr GhjoMjypSVCMrbOvduXBMg17E5sI+Ypgd1xviuryZqjk40fuEFBfRsxCgV57+29WT3z UdDsigbzIaK4ndsvM+T7rO18gb0KND8PD14HLwgREOK7ArFlPRSgRzxCqqbu7t+Hnpi 0/ErrpoQ5ICslME4sZQa2YTpRV5jaQB5c++McoTNuJZGt81XufKyIJEHl/MY3gQAPGq i/HkbxkULQ== From: Benjamin Szőke Merge xt_DSCP.h to xt_dscp.h header file. Signed-off-by: Benjamin Szőke --- 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 - * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh - * 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 -#include - -/* target info */ -struct xt_DSCP_info { - __u8 dscp; -}; -struct xt_tos_target_info { - __u8 tos_value; - __u8 tos_mask; -}; +#include #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 + * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh * 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 @@ -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 */ From patchwork Tue Jan 7 02:41:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13927996 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0E544C97; Tue, 7 Jan 2025 02:41:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217723; cv=none; b=YkERzmFxKOsf44ByKottvohkUFP7cdfwn3Vop6lGtKSd6jPOcxcWA6YxsfomiObYpeIX2My6oxRZ1v4dgrxGBgcQi/dJT1rTtJdZAym+mKQqaMu6nHklRRlErs/fQkT/t24Y7/hQCJIlLPrQqphzrlaUOMS1lDs3p15q/NCwVRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217723; c=relaxed/simple; bh=CoZLwngNk1HI+xyUEzftbV9Cp6J/4wCAg0aIq8aJz64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S44lp8LcdWgykcWasYQleazMutbqUB8J6xO8vdBJW1UymPUtB4bHKvhx1fiHuSFcbpKKiW+nNHlurg4dZ2z9uP3sJTdapRQNRWtNFPOSvn7bY/27IzwICUdqURPWGxlJ2Gvb5fl7TT1pWkA25QpvLrqbsZ4YbnMw9mLH37goS6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=UR63CZRX reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="UR63CZRX" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwLF2Yp2zVJf; Tue, 07 Jan 2025 03:41:57 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 02/10] netfilter: x_tables: Merge xt_RATEEST.h to xt_rateest.h Date: Tue, 7 Jan 2025 03:41:12 +0100 Message-ID: <20250107024120.98288-3-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217717; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=1879; bh=VHMDPbZs+ZeIAPvV9I4olaEjrmptl5QG2Xf+QZlijjI=; b=UR63CZRXQXgk2UUAtyoaYIvVdYyx+TufDLVBRO9ED7Kb+npX9nA73OqKbwCLiLgo GXlBvl1hq+5Qi0K7+wCReAqXb63A7hR71ulnfG8rl9tnksUy7/nFJNXatxIR2DIXJ+o qs8T22miSxE1RSKB7/c5CUTP3HDK49W4hYYY1if/4HgMV1fm9812V4sqGW7zktPM/lH CXvOX9yKC3q4l7U0OqZYuD/00W3b5640iylPPL17Q32gJaH0gw5WIABlZzhMReBIu8h 8ZnUdmIjP5SQhjs+6HpmGBENojzNy5LPiyQy4GQ70zNtcavz6gcmqBNr96eVYa3njcq wWeKMCDeow== From: Benjamin Szőke Merge xt_RATEEST.h to xt_rateest.h header file. Signed-off-by: Benjamin Szőke --- 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 -#include - -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 #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 #include @@ -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 */ From patchwork Tue Jan 7 02:41:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13927997 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE87D154C15; Tue, 7 Jan 2025 02:42:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217739; cv=none; b=DYLbslxjo668zJbRBugEp3/oMqH5ndnsPGSCmLCMPYMXipPzkOcK2fqU1VLWLal/hXIxPuPPLRNF1eXZdEu7NpzBifEn8jTbLnSXThEEgapid56m4ryPJsI0SVqI0zkUr3v3A1Z+HdkRhOUIDGFSX+rKJPw78fch4fanzKYdzUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217739; c=relaxed/simple; bh=N1iZ0A+L1cR3LWgBVvunWiijh4ctkDKupu86Nc/k02o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u6s9VfL97OdEjN5SN42KR9V9/lhzg2pAhaTAj6YPXpBWF5zjWkTPPDCR+tStW0xpQxzF6KYWefdfFxaQktmmktZHdx/dMTDDB/96J3VAAfgp6MwtQhpKqYFbNlQsYHh2caxtzxCOSjZuhFkrKKSuFwLt4Fkj4hS97VU0NX8SUQI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=T52dVo/L reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="T52dVo/L" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwLZ3tLwzVvS; Tue, 07 Jan 2025 03:42:14 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 03/10] netfilter: x_tables: Merge xt_TCPMSS.h to xt_tcpmss.h Date: Tue, 7 Jan 2025 03:41:13 +0100 Message-ID: <20250107024120.98288-4-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217734; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=1696; bh=BuL3xsSP3sRZQ1KBecnIjibmE5uLKwimFqRzdhdAoTg=; b=T52dVo/Lqu9Q8rWszvo/BN3BsZqh1fZ087Aibzwe5oT5qiJ+aFS9uyVl3Z6z6oiA 8u6wGPEMrp2avIV3lM1K5MmU+pkVVhS1CIp32LjqUKBtAuoUr2PYyWQskk9xnLaUsh8 FX54+De51mnDjA99FCGynV9m8TO10u6jZ/aMAOorH6rjHrOFxq+PSGtx5ElK0tb95k3 q1oxhvTK4QKdMppxHLwq+mvlqYm7utOS9g0Fzvtw/vb5qMaLCJnVoj3UHFAM4Lhv8B2 LwbSVdsQl8OgAGDsAiGEvoi2o6GvjDOeKb+hYKODolRLao2piRJwbv/hQZv3SnyBqiY N3A5kPzkyw== From: Benjamin Szőke Merge xt_TCPMSS.h to xt_tcpmss.h header file. Signed-off-by: Benjamin Szőke --- 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 +#include -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 +#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 */ From patchwork Tue Jan 7 02:41:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13927998 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B81D158520; Tue, 7 Jan 2025 02:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217760; cv=none; b=Ukrs3brp8hh9UBPJ58JkE5vR2P/bj3XH0LC2SqFAZZlgQ4+yE9ClqkH0Ub69j66D5jZm0AdqDjyu8aR2YMkmO9TKCc4IWmwUPfdQHK0WvuUVQHIooY/O0KpmujZIo12UCDuEO4s1ZDyJRQIstEn3ym9Cn6QOjVaaldrhkwSUGNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217760; c=relaxed/simple; bh=xCcWsG/Q99+lso4CrTjjKzMXu9jpM7dMCvc873YJkM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fQSpQ16TsmzLaVDbl1aREmP3rhO+RgkolVMb0kQFeKJ566kHgF+dFlgx0ks4AG65z4b4V0kiyMHeTdrt/ZFZ7JSVbA9fmRvmhkWNHkImDoKO4ug/jKLLS+7q6o1sKSiM5vhGxSnFTOoq7l/DouCFH2WAh9ACRcc2bwEQXCpxz4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=XkqWBjQm reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="XkqWBjQm" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwLx5lbrzVWy; Tue, 07 Jan 2025 03:42:33 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 04/10] netfilter: x_tables: Use consistent header guard Date: Tue, 7 Jan 2025 03:41:14 +0100 Message-ID: <20250107024120.98288-5-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217754; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=2788; bh=U+O+QQrBgE01gkQ3uru8WWKkGH/VzN/ORKkOt4devos=; b=XkqWBjQmD1M5dabRUOSMpUe1++Zq7QQvPtpZJrGHvXrGT2S2IxjFUNGHTUHRN1gy JJZsUvbjjKwgOsUhzdra1c0mmWf26UA699KEkI3AclM8hCCcMPWeBabYSRhc1Hgf7HS X3SOZ5JtKPltRCVd8Q10bV3BwPgj9NO+jC0SPs0nguvOukdm3v0w0E6f7bjE9h1kuZd bE1nRs1gDNbAyd+3k+pIxYIzX5++tQ1UgAvMrLA61wsxy5+rrE1uBRzMaCA/xes5k3y 35RSc1cHEPYVAq8TRDKh2NzgUzbbl9G3GFvlE5jl/vnU6QU5PxbImpUUKfXug0/4TMK b5lA4+TS0Q== From: Benjamin Szőke Use consistent header guard in xt_connmark.h and xt_mark.h files. Signed-off-by: Benjamin Szőke --- 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 -#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 -#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 * by Henrik Nordstrom */ - -#ifndef _XT_CONNMARK_H -#define _XT_CONNMARK_H +#ifndef _UAPI_XT_CONNMARK_H +#define _UAPI_XT_CONNMARK_H #include @@ -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 @@ -13,4 +13,4 @@ struct xt_mark_mtinfo1 { __u8 invert; }; -#endif /*_XT_MARK_H*/ +#endif /* _UAPI_XT_MARK_H */ From patchwork Tue Jan 7 02:41:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13927999 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7829E188583; Tue, 7 Jan 2025 02:42:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217772; cv=none; b=LQggRtucl0Sj7x787eoREvg/owgj1d62Fv2b50W5wfsUkAnT+xYsx1RT5bLdZdEEPyonZaEt7dHHlnBdVtWDRy2u/de7TnhuptVzETr0+DQ2EU+R6Tw2CJBNAXNiBlAD8CiTVzifcQBps5ZPUrpZRKp9TcNaznoq/JIc62TCpoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217772; c=relaxed/simple; bh=5KbVOLIEhppSl9eTrCGfOcx2MwanYCgoXHn2E4PjB04=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=umnx1Z/GgpB5Y6vvobjUpTLckODfuPfvQQrz7DQk5wFFnGMKIGS2nK0CUOWHMHpMT4M3uGnKJejvrrAzW8PKCvoza9KrDhbxG+MOZpS7ouxKqpT1A5RbjhSu/ub/i/dHhyjRW2dt3t/cKL4P+2xzKmVYsC7ELz1mD+0n/A0l44g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=BVJX+AJt reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="BVJX+AJt" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwM86c04zSyj; Tue, 07 Jan 2025 03:42:44 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 05/10] netfilter: iptables: Merge ipt_ECN.h to ipt_ecn.h Date: Tue, 7 Jan 2025 03:41:15 +0100 Message-ID: <20250107024120.98288-6-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217765; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=3050; bh=GSA2733TurAqCiFq9AeYa0+zYNzqBVCgCF/412Y5ptk=; b=BVJX+AJtUOXfZXT8bkWXZSYr/dJOq0d1l4/hT5v9GHOVBa52aW9q7dPgRVaM9LX7 PjM+WK66eoMTj4vgqpMn6fEIYpyVcPvXm7auQ4YxrW0hB1wYpqnhwm7hxcq8vzxZ2N2 pxoAdlY2up9phbh3RF851lsbI4uQxlIv92oKOsiRxZ8IwfGKH2mx+ZtxSDfUrW/AdAC CO3iuSmwuk9f3WyGuaLhAauhoDXQbkWjBYk4OsYFhyupaXAbVinE9i+b0nRR5xJOgss kvOWcxOvwrJ/rzexDTgvTQe74rnvF6SaIaesCLPKPgklnW+dXKMtQUAK/yJmQwhT1cb XeQgNCXYCg== From: Benjamin Szőke Merge ipt_ECN.h to ipt_ecn.h header file. Signed-off-by: Benjamin Szőke --- 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 - * - * 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 -#include - -#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 #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 + * + * 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 +#include #include + #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 */ From patchwork Tue Jan 7 02:41:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13928000 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84FBC13635B; Tue, 7 Jan 2025 02:42:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217779; cv=none; b=q29hYCZF92ejhVMFMBc2mxpJ64mGg4S7Wwqcdk9WyiaiGzHuzJTHCon0WW9n74gOz9uMhKSZ2sTBVr2Cs6cclXhtl8ssZickYo1slepTr22eluSvonbbKQ1W6ZJaSW7arB5LQtEWcsPkw3Bfs4CWJ4DLPPiR8st6Cu2fWWFIs10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217779; c=relaxed/simple; bh=6o+fzAHkRfrjDzPuDP3xQU2KnPQomA+aJMk6e9jB75s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dzVJYfKnVlV37neUkQtB2nUFywJGpQzvf5Vf9qZwlriVJLzqTxLTQbF2Pfb9nATRGlT3OjPj/gubLWoMfXJSbmWN8jsKEKRcwC0XO2VKy3jmCa+szi3vjbkLVGJgRrTQXNvPg2WuTK0pfUo27cLz8QDf1OMbzkH6tVq+ilMld5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=HYPrLA3U reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="HYPrLA3U" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwMJ45gmzWwl; Tue, 07 Jan 2025 03:42:52 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 06/10] netfilter: iptables: Merge ipt_TTL.h to ipt_ttl.h Date: Tue, 7 Jan 2025 03:41:16 +0100 Message-ID: <20250107024120.98288-7-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217773; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=2105; bh=nUYN7A4x2UMF+ZwW0f7oaG/E4oRt0yQxOAXub0eMVWs=; b=HYPrLA3U8Rbyw9o5j+TLz09Ahs922/rJmlZ7YIM/uqyo/673h5rviJIyqLufua6g J4TB6ySKuMDBtvghshNIVUrQqtmk8Cwfk4TB5qZGTo2KAdaH5flUIdC2HHEX9dbh7ph ErpmGBP7gKrGMKncHuhh2fWpDbbu+XGq5HaOkxzjQYCoH0RAHEZzMpLbB99wHTMappn IJsK84nXG/WfDQFlc4xQm2BOfevqzLPH+R18lcENxSN0NQJgZujzy3mNOq0GPD2PySi jIji+xoQRsk/r1a1Hq79QNVGA9O+mZyYMMLwrXMTPVjBB7QP94gih59rBmquFdBX/7O t/+6qx0c8w== From: Benjamin Szőke Merge ipt_TTL.h to ipt_ttl.h header file. Signed-off-by: Benjamin Szőke --- 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 */ +#ifndef _IPT_TTL_TARGET_H +#define _IPT_TTL_TARGET_H -#ifndef _IPT_TTL_H -#define _IPT_TTL_H +#include -#include - -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 */ - +/* iptables module for matching/modifying the TTL value + * (C) 2000 by Harald Welte + * (C) 2000 by Harald Welte + */ #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 */ From patchwork Tue Jan 7 02:41:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13928001 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00EA0770FE; Tue, 7 Jan 2025 02:43:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217791; cv=none; b=niAIam2NeCs9eJ7nB28EFE55w5oQdjym7A4QluJ/xiil2axBDb4EckFXEek5oyljev54AGLFOnuNo+adEDr45OwN98TvAwGn3wgVPeyTa9ITOFm9luEjaZiBxYZZ5PMgmObZFtUR2Fuj4d0gPHM9P78wOeCWkljzaSCyf4AhAjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217791; c=relaxed/simple; bh=M2/xHC40pTKnude4Ks5GUQHTqs0SC74rEE9yurtG7Uw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IDS7thxQLIjd2xpw2zLsftPF2fHZfdAQXhtElRi5fUYhpJ0n8fTSKNEKebwODN6FzflSK8eELDCgVdHLxcNkVWkeAbj5a8E3PUxcETSFRtN1dmm1yIEZnghvVEsuvYrAbO1SGx6edeR72Au1TilBh3fS84PTbm9TfoPwYtcpwCk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=L67fwGw+ reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="L67fwGw+" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwMY4W5fzSw0; Tue, 07 Jan 2025 03:43:05 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 07/10] netfilter: iptables: Merge ip6t_HL.h to ip6t_hl.h Date: Tue, 7 Jan 2025 03:41:17 +0100 Message-ID: <20250107024120.98288-8-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217786; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=2103; bh=EJnyRYzYs0oWDfQj+jkg/6H1ACv4ppRv9UGiJIQj1/k=; b=L67fwGw+I2jA/N07pXFH9IOLJgDw3YiGUeMDAEkQe+eNeGXUtwUD1K6q+ENnNOpy frAloApvwzMK6h09tNtZzUFtCbdGqnBssnkN8BOohGVBr8uC/8G9E2ES/UeyW6s/Ko4 O8TVtNSduXoSnil6WFyrwFExO7ScYFcuxlVGM4QHzMpiqGNZwDkVDuPE4RgX7n7rcjG 6MYXIYe2B0s48gG1D3QWugatkPYPOL0+TmA9Z39S3ROJc4NCW2fMECl79nONN1JyY99 V2h+oH9Ozgw9rnjK7fCnABcw4rjZ225aLhEI3C1Fy7IRsX1smaEm0lngeewhZ3L3WBU LNuTKWsYRQ== From: Benjamin Szőke Merge ip6t_HL.h to ip6t_hl.h header file. Signed-off-by: Benjamin Szőke --- 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 - * 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 -#include - -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 - * 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 */ From patchwork Tue Jan 7 02:41:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13928002 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 801CE13AD22; Tue, 7 Jan 2025 02:43:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217801; cv=none; b=nwj7gAnEq7AOrZs1ahtH89eJ8FdPPGgzTWZ+zvduGLIhR6AiHM22cqjwZPjl/D9U8ptTkcCG3/xZV66R84YhdsQhMqHqq5gh4USp2JL+an8VIOe6Oto7MlLGpZ6toY9wPERfWhsPF8iIu+BxGkYNAnJFV4qCj/Lr9Kx/suknBfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217801; c=relaxed/simple; bh=7Etbu6S87a+ncslqk3S8CPfpDz8RBLG+Eq2nEskQqfI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KNKJ8cfm4T0npDj8728+vrWHGG00Q9lVpupOrPjOy4FfTsAwxQhM2LHsWJ8LBb+hYoCYIA7Eh1GMXlAWCUcbs6z36bFz+n11a6YSsCmlNIZXD/0fOFbSNB5QYhobgieSTvFTY473gaNXVcY7wRK1Aa2GIHRa6XjEFmOBRqccTvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=nZRlTOUI reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="nZRlTOUI" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwMm1yW3zX5R; Tue, 07 Jan 2025 03:43:16 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files. Date: Tue, 7 Jan 2025 03:41:18 +0100 Message-ID: <20250107024120.98288-9-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217796; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=3965; bh=h0kpqcWPMTO54IYy9T0CRv0i8rvpud+3ZIGDNgCfsys=; b=nZRlTOUIBwSSMOJywAcptknzk5C27mlWdFFgrRP6m2Y8ctzYarhyJu+fFxjqYOWh gOyNLhP53oOE2CIL4cC+G7nQF2+NspdH6i/Il2raUlUlMNVRxCD3Sa22dzJnKSH0q3j /HTSRssmHz3Shd8jcv/jtbjpCTdFE6g5cHk5Gl3ZSWowLTKxkcAG48der4WI2eoKnnZ fr4luObWx8h/76bSjxjpOtnNMmBoJkTSRvBAnOFoabRPu1/W6LuhNbpXHD/W9od/0kr Lomd3ylvpRZwPUejF7K6A4cVfKQyeewBevP872z3pEoY2xkYKKj3RdXSeHmdty2ra4s 06utK9v9Ww== From: Benjamin Szőke - Adjust tab indents - Fix format of #define macros Signed-off-by: Benjamin Szőke --- 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 -#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 -#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 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 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; From patchwork Tue Jan 7 02:41:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13928003 Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E43E1991CF; Tue, 7 Jan 2025 02:43:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217813; cv=none; b=UKV5vBXnmNtOweS1PxyCYx7D8AiqyFrARHH4G4kBeLqemf7RvfSy7Wpc4c6RR7C8SaYgLP5jTiszVzKfkwO0ix09d3pz/YmEdJYVKZv6j9p1uFeyxUrrKamM2ngA1ICIOpfX5FXySOyRPf+fNnxOXSl0wyEDzfyGWt/vvCS8LPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217813; c=relaxed/simple; bh=WVhwNPsyYcOQvrsX6lGLzPZuszJkjloBSZPn/KVC+8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WK4eLz6ZZpAN9UXOeDvj8kmgON4D3ZQnlgETKmNyTtJodYu0gO2XdypC2q2CroGFp6zNjDp7kiWGHii+DgMg+b9VdWYdI2fgLa4ijRVJ/0/qSk9spCgA5NNVHvGs3wjE5XH5VkxHhQzGSKmn2xo2lx/qm99ylwVK05gayx/UGqs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=AjABy8xJ reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="AjABy8xJ" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwN10B5QzX5S; Tue, 07 Jan 2025 03:43:29 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 09/10] netfilter: Add message pragma for deprecated xt_*.h, ipt_*.h. Date: Tue, 7 Jan 2025 03:41:19 +0100 Message-ID: <20250107024120.98288-10-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217809; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=4064; bh=DrSJONT6Tt6pfScddDoZLKvf4GZGoxtEa85E0u0wrX0=; b=AjABy8xJnuGNO+LlvpyiDuWQyWKRy6R0XnaLaU0kpaE6grgWVc2gCDJZk7OGoujI t8tF0YIafSynDQiGzUpLbxzjKEQ3ceiOK0GxXQ9aBD+Uo3TXAjeC8RGmuKyjtWCbwRe V041w6tjh3RQMYAyyRpIhgPmvnl07OAp0bodW/Cjf8Az/R/4490jXwQ27d+5tAbJTVi la/pZb0agQWJ1NpPxONrLb2yBBs9A50hEsGuGlDuSKCxaJmxn5n4Y9+inFhq1V//kTX WxYqj/w3bGIdVhON5rtP+i7ZEpSSNMgAhb7rKChTI5l16DTbDyYEhsReQEG9OdRS8Fk SFH7TYx/CA== From: Benjamin Szőke 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 --- 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 +#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 +#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 +#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 +#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 +#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 +#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 +#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 +#pragma message("ip6t_HL.h header is deprecated. Use ip6t_hl.h instead.") + #endif /* _IP6T_HL_TARGET_H */ From patchwork Tue Jan 7 02:41:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Sz=C5=91ke_Benjamin?= X-Patchwork-Id: 13928004 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp-out.freemail.hu (fmfe19.freemail.hu [46.107.16.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EF7241C6A; Tue, 7 Jan 2025 02:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.107.16.212 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217831; cv=none; b=cEbQvP/EnTGpyQa+JVaFgSvdwvBxeKPCJs/yD7VbM22xP2sqGTIyE+hLQKh6rS0INpWkikIuUnIL9VrgdnDhG6wNMCYPlYX/KCfnug4B+Nalg/Jjbnlt0C1WiIR3vUlsigi/OXTeqzGspY72l9jkW4oC2zDcuB0TApznzNyoSWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736217831; c=relaxed/simple; bh=YMUtxu3ZrQ8r+vp5iNnZHoTn55cwjES43gOUeyMFtZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DNuGmtXEiV7nYePVoKIXFMM28XVQnIbaenSwrfc3WImVOQlOp3GMa4d1rZNdcwdYQUNzEzLtHu4VQgFpS1263TwMWsv3lJjBC3KdQ83J8M0DlIX2Yoyd5UGr/NgWps0DR5zknHHby0plldDZtgWwiywdIPFApQ4XbQfsO90l83A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu; spf=pass smtp.mailfrom=freemail.hu; dkim=fail (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b=2BwGqvk6 reason="signature verification failed"; arc=none smtp.client-ip=46.107.16.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=freemail.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=freemail.hu Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=freemail.hu header.i=@freemail.hu header.b="2BwGqvk6" Received: from fizweb.elte.hu (fizweb.elte.hu [157.181.183.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.freemail.hu (Postfix) with ESMTPSA id 4YRwNK60QhzVb2; Tue, 07 Jan 2025 03:43:45 +0100 (CET) From: egyszeregy@freemail.hu To: fw@strlen.de, pablo@netfilter.org, lorenzo@kernel.org, daniel@iogearbox.net, leitao@debian.org, amiculas@cisco.com, kadlec@netfilter.org, 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 Cc: =?utf-8?q?Benjamin_Sz=C5=91ke?= Subject: [PATCH 10/10] netfilter: Use merged xt_*.h, ipt_*.h headers. Date: Tue, 7 Jan 2025 03:41:20 +0100 Message-ID: <20250107024120.98288-11-egyszeregy@freemail.hu> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107024120.98288-1-egyszeregy@freemail.hu> References: <20250107024120.98288-1-egyszeregy@freemail.hu> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/relaxed; t=1736217826; s=20181004; d=freemail.hu; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=2774; bh=X1NSHN7AudtxJJL7cfhLz4NFxJxb/YyHcQzUVR5zAAE=; b=2BwGqvk6UWyDhYcmbWw02c+XDBAEtOEoMMEHwdMsiEje9aeSmjXBhJWW9Wh3x7uo M4kleri3SmJfjqFWVPS5j8M7A4eOamnuUrDVJSPjND6wyQZ5hbZV3ufZOw+e1w8V2wP ArVBQyi8cpANmrDEvSW72q4jZgskfwAuJ29juuDuSxZA9B/yBluvci/0SZ5zlQD56iC u+HScqirhauozmIx8OxLuNAPG/axfTUzOJ4snZ0kflK3y8tXbnVkD4sjA1WhWzShSFX ikl63Rgh1F7cLcisXF//R0GAD3ol9m691O+Jkd1OQBlmr0DilQLVErk9q5f5T90FhU2 wkOB8YyqHA== X-Patchwork-Delegate: kuba@kernel.org From: Benjamin Szőke Change to use merged xt_*.h, ipt_*.h header files. Signed-off-by: Benjamin Szőke --- 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 #include -#include +#include MODULE_LICENSE("GPL"); MODULE_AUTHOR("Harald Welte "); 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 #include -#include +#include MODULE_AUTHOR("Harald Welte "); 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 #include -#include -#include +#include +#include MODULE_AUTHOR("Harald Welte "); MODULE_AUTHOR("Maciej Soltysiak "); 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 #include -#include +#include #include #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 #include #include -#include +#include MODULE_LICENSE("GPL"); MODULE_AUTHOR("Marc Boucher ");