From patchwork Wed Oct 21 07:17:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385375 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=XGmSKaGJ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jAsKiskW; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMY6rMCz9sPB for ; Wed, 21 Oct 2020 18:20:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KVh0eyc74ne5aysdpsVM7YZhAxoq/GBNTw4T12ghhb4=; b=XGmSKaGJDhbPLSb9FFS3pFONz 6y58St0BFadriAMEBXh2ZXfOvhDJ9B1B8hqVYmT85JS1Q8w9bVnWz8M9AfgDXT2cvN4z8uE0jJgOj dBxvZN88DncFTgsgp01z2lHFhu2DXDe9NmoF4HbK7mCC2jrLaOkM3yvlcU3CWfMyKlViyrhmgdC5K NJPZGLx3kPLu/hpxqH+x7sg6IVaiOIEGf710cson/ZaWiL6EDyIO4unh4LHMNsML2No128rh1nsIa IVTMwF+QfG7deoeenVc2jFNdKz1SKlZtnT2b/yGC2Z1Jolezh4txlLe/7r8wjAHdUTNM7FUJwq9F2 LkNmRozcQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nm-0007H9-QI; Wed, 21 Oct 2020 07:18:02 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nk-0007GW-86 for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:01 +0000 Received: by mail-pj1-x1044.google.com with SMTP id hk7so679878pjb.2 for ; Wed, 21 Oct 2020 00:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hjAObMkQr1MLojJ6QqbH50LR65sHnBm2FuW1aMe1S4E=; b=jAsKiskWQ9wrXvKceg8PURPrM+d35n1zP8fUij3FXC12DH0a8FYOg/x81nbR7xVu3w NK8KQU1x9ZaKJ8IfIR0mC7IeMbDiic1ucCfIIWDP4twqOeEjOd2amk/9P6HVxpK3BUo+ Uyq0wPI2S5pL28/KISSUweIqtrPLJn1lDHOAv4snmMRL/HuUQ79zf4CmopSAKhxNx7C4 ST7SLvd0J/TTFNjUYJqVI/MqUiVEX60g+nxIHU1UZmn49cP90NGleg3VJFXNRgCEM8xI jTkfyCK8zqUqOUjK3TlEKUfrDg+O1gbbIyyNCqkWJl4YBlpMviu40efC8UTPGJnlC3+z CXng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hjAObMkQr1MLojJ6QqbH50LR65sHnBm2FuW1aMe1S4E=; b=Uxmy5LnyNPFLSGGgbwmUBl2odQBKNAlKY7JtgJoi0Twsz2vBy/q3azGRuhkWpztazW d7Opvi9gvrqLLeibB8Of+SRIJdEsGCBaxiV+RIsAa5vdLQ0022YF39yq6bLxK5GQaWYd NBAshGMJC2RKeYFKLsY1uhADrwqLAF2LTovfRfFXhAOkNPnoxT2frloASIWnpppaYaiY IafTcKUkMw2RNkUWBDhtmeF3JLmgCXZqsH4YG8lkhwDCo6ArDQJmSfkMB12Aehl633i9 ZnDFVplM0uKWUvD2QVb59coDTln0MlO399OZV88Z156tH7uGUNk/AePwDIj7/hEcLOes X47w== X-Gm-Message-State: AOAM533KGbm/kaKJzVDiEX3fW/KWByIb9Zo+DCddG4ctz0QDJ6MWytaa 5+xCJQ+tb73EfqYqT7MIYNvWX7uchFU= X-Google-Smtp-Source: ABdhPJyz/5MuylsQ3Lbi6BaA7TWV1envoH4dB27at3WEx5/3XGo57PeXYdnpEbwpFLnEhVwOJg+rlQ== X-Received: by 2002:a17:902:a983:b029:d5:a524:8710 with SMTP id bh3-20020a170902a983b02900d5a5248710mr1901641plb.28.1603264678242; Wed, 21 Oct 2020 00:17:58 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.17.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:17:57 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 1/8] netfilter.mk: use CONFIG_NETFILTER_XT_TARGET_MASQUERADE Date: Wed, 21 Oct 2020 15:17:36 +0800 Message-Id: <20201021071743.92801-2-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031800_322189_8F0CE6B2 X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org CONFIG_IP_NF_TARGET_MASQUERADE and its counterpart CONFIG_IP6_NF_TARGET_MASQUERADE are "backwards-compat option for the user's convenience" Related commit d22c1755 ("netfilter: fix NAT packaging with kernels 5.2+") Signed-off-by: Yousong Zhou --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 5d6e3a0c98..2047dcc842 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -199,7 +199,7 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT)) $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DNPT ip6t_SNPT))) $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE, lt 5.2)) -$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_XT)xt_MASQUERADE, ge 5.2)) +$(eval $(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_TARGET_MASQUERADE, $(P_XT)xt_MASQUERADE, ge 5.2)) $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT)) From patchwork Wed Oct 21 07:17:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385377 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=1U7DJ2Md; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QO3xAqyS; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMZ1V4Lz9sTD for ; Wed, 21 Oct 2020 18:20:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=N738rCvU53cBRdGYDELLl0J4oBfUaJPkxlwVa4XQxKE=; b=1U7DJ2MdfA2raZcDhc9cVDegK Oll3EvlNCA/V2eZjhZZKc6YX26D6KVkvnK5B2hLs2+Os6xbbw1ngVt+Fye9Jxm+5IGQILYE+7GXch CyP4GYhYr7Id33YFWNjcF3E9+U34kN4XslIgxjmjMk97K59HO/aqBP6UUqyJLqmfkxtTegk0I44zq 7Gj/kyJr/mnYUPaBjBKGS+0M4qYJ63AwokUzwH36WtbBFxk4ipMVM4G6MlAARRGbGkPDEHk81FljB jxrkX4P0kMm1NTmV+vTqOOro+7XiK+EUGQJ7GwI4/+7Drit01NTxv2czfPGd0Adk7yDk4wUNIQVf2 NsGu3ZPbw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Np-0007IV-Sv; Wed, 21 Oct 2020 07:18:05 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nm-0007H6-FR for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:03 +0000 Received: by mail-pj1-x1044.google.com with SMTP id gv6so674622pjb.4 for ; Wed, 21 Oct 2020 00:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HY0sITZoKW0kUXnVPfIgfIWxVPv1jBMDeqpbSB2VX3A=; b=QO3xAqySu0Od6Dr6hQdw4sAlvXVBwL1o8mKJveYO8AXSv/0TuWfzB0TpXhG5Qb6ysQ pPUjI8OyAQd2u1JABOyohjG9gWkJmTAAJOv56+vCngwCrgNY+2Ndqw7Jb43xMXvHisSs mUtcSNujFhHRQZY4ImBWSgpvELGDVAHsnmc26jdvtaFocCW4ykfQipQxy1BqZWbva2Nn uGDlg117CELyqWKKTVNH7LJdXqodEwTrMTvQfdDMC+FkIP7K74oj/N49j9ycnIEv9eS9 jsseZePgZhXU93GNsWCm0K9KzkgkJcY36SsRjMLhtmjpSpsJZREFnZ1uxx1Sg5gDMMzl BfrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HY0sITZoKW0kUXnVPfIgfIWxVPv1jBMDeqpbSB2VX3A=; b=Sm8dzls/U5cH0sD33ltEn8Q4LHcNhQsIKQT60k1pFOJGNNMI4gQ4/w6OVvwo4FXp2g ZjftKhbaRmOiW5ZBFQXVzhG4/iHVDQOTzQ/2azk/Q0DC/zC0FgGHHDDiNU5Xs02g8hTg N5tzbN120Sp8y+RzOgfEoKZ/+Yvy/7d7dLq04J+JHUO1kMHDf9jpv44ufS959EKkrZ6y B9MXJfCKSAi8B1NWHhfrH9wyqjHGjgMhtK5JmaVBSZAJbf7WC8vgt6PqzBJRf0lSxCUR H5C9jj4L9o//7YIpjlFOg3of068x4c27vN1c41H5A2XZjiK8xEQSVoWpHtm0pe/eAv3P KxJw== X-Gm-Message-State: AOAM531SONHYCRf226Jd5r+aZiUhJAkYZe+1/9UWz1BtQhESAryQ5Vxy BMYFmG/3HzhzXzKq7v6RNrvulbtwwso= X-Google-Smtp-Source: ABdhPJyJRcHA0xanYA1BJDsnPC7NKgnEx+R5n2iWOQBFnnoyb11rRkkSUWNxUpXdE/5mICIj6/3xAw== X-Received: by 2002:a17:902:bd0c:b029:d4:ba5c:f37 with SMTP id p12-20020a170902bd0cb02900d4ba5c0f37mr1935324pls.56.1603264680471; Wed, 21 Oct 2020 00:18:00 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.17.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:17:59 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 2/8] netfilter.mk: use CONFIG_NETFILTER_XT_TARGET_REDIRECT Date: Wed, 21 Oct 2020 15:17:37 +0800 Message-Id: <20201021071743.92801-3-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031802_539738_EDE5F5FB X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org CONFIG_IP_NF_TARGET_REDIRECT is a compat option since upstream commit 2cbc78a2 ("netfilter: combine ipt_REDIRECT and ip6t_REDIRECT"). That happened since linux 3.10 Signed-off-by: Yousong Zhou --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 2047dcc842..9f22512d68 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -200,7 +200,7 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DN $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE, lt 5.2)) $(eval $(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_TARGET_MASQUERADE, $(P_XT)xt_MASQUERADE, ge 5.2)) -$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT)) +$(eval $(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_TARGET_REDIRECT, $(P_XT)xt_REDIRECT)) # nat-extra From patchwork Wed Oct 21 07:17:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385381 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=IsYbXnt5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YNIN2sHk; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMm5ZYFz9sPB for ; Wed, 21 Oct 2020 18:20:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=37N6quvi4xXUvmLKd3kr04vBU7We9Hh4NYmgl4+qLHw=; b=IsYbXnt59dsjZzvf5MGAC2ZYl EZVb4A9LLnhDnPB9jM1OSMMfzT2mXDgt1VSCWAtYWb7dpevkfwMOXyF354r2SjgawSbfb8jg+oV7Z 0y/Ichq2Cxl3gg2i6F+kWFlgDjm/XtOGX882Hc7cZn0Y/Ga8qj2OmgZqdjUCriVZagH2xEJcr2nwC z20cEEKvEBMJ2RfdaYNqAqeeFusUMrm+2mpb3AVfYdDqDl+8fOzE497qTniGdGMhmpTuAobhuh+TC G5CHHSF+MToxVcJ4gPLoGgCRJY3OeXgGISE/GrlWPJPnpVaZVmN5Sx/p6mMBjab0szTKVGpjY4Guu WRgL6OYLQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Ns-0007JM-I2; Wed, 21 Oct 2020 07:18:08 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Np-0007Hu-4r for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:06 +0000 Received: by mail-pl1-x643.google.com with SMTP id 1so767035ple.2 for ; Wed, 21 Oct 2020 00:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=466I0UXDVso6JihS9MOj4cIXA3vfNod2ES8veq56zh4=; b=YNIN2sHk/04l6tgk/nkxSWcaYDDxVMYwT/TMa1gRebFx/6BBEJ1MPpU7XvY+UypyGO tGvhdgz4VV53CEmFhDf44Dc0q3LdbYtETWzNMRNijSkzQ6Olf7yVsWTdfsclmnVlE9e6 XUPqozzGnbjAKe5fPeTFFLLktiFIuTS201sfaNTTliikPUSSjCTMZkMaihA7vloB98kS n5/hwQvmA33po9ySRNBP+fd8wcxmS0CRFapkT4UAEWZGmxC4TIZgJI3L/oHGRE8gGz5z nxpe3EEB4479nlCNrhrDDU0Mn3NK7XzgBCHpsh9AuNNtjBLrWphrwU0AFuKNmCzMLHgp kGOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=466I0UXDVso6JihS9MOj4cIXA3vfNod2ES8veq56zh4=; b=QQ8oLV5l7C5wXWg7QJeH5KJbb1hR6uuuOkAlQB71/BarSylVs2X2+Vp9CCY7QPTdOJ 4n+HwDIcmnBjoFn3iWNfLy28q8K3hb32oFunC1m2YIccKmNQGqy1KU1rxFtDFoPuPe0K P/bm2IkCWmB8ogRhQb0Hac2u5xd7VAArVYb8LNZoFBBJva2IVfzHS6SLHGAW2fvOd94K nCvxMUn4Wkz/b/U0sDjbRtRoeT1Gw+EX4jUA1qzpOYgJ+Kq4+ULYL4+k28c5VAb2gNVV kQ2h6F6mYHizSet1Sx62zC9hMfjCZTkWbLD0mUdH5jPbv0x12dcn7aQ3GfR8PhGzhwu0 mmLg== X-Gm-Message-State: AOAM530sfSPLT14TA6b84Nl9YMJ/LhktgeKUCC3nF9i7zE5XpL+dNgLC m0GNSPo4Duv+URyR0KveSNy7kLvihXY= X-Google-Smtp-Source: ABdhPJzDYS4f5q4t7C18EJDAVf4ISHvWutiIiaZ7IjiAio5nK2FAL4zy8Ot5N/TRMcaINj8ASLWPlA== X-Received: by 2002:a17:902:bcc1:b029:d3:9bdf:32e3 with SMTP id o1-20020a170902bcc1b02900d39bdf32e3mr1901012pls.1.1603264682703; Wed, 21 Oct 2020 00:18:02 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:02 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 3/8] netfilter.mk: add version conditional for nf_nat_ipv4, 6 Date: Wed, 21 Oct 2020 15:17:38 +0800 Message-Id: <20201021071743.92801-4-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031805_254731_44981D39 X-CRM114-Status: GOOD ( 11.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The upstream linux commit is 3bf195ae ("netfilter: nat: merge nf_nat_ipv4,6 into nat core"). It was included since linux 5.1 Signed-off-by: Yousong Zhou --- include/netfilter.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 9f22512d68..3c217db106 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -185,8 +185,8 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt)) # kernel only $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, lt 5.1))) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, lt 5.1))) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_nat),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_IP_NF_NAT, $(P_V4)iptable_nat),)) From patchwork Wed Oct 21 07:17:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385385 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=i5v4iyk6; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=L7+Qw5pp; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMv4xr8z9sTD for ; Wed, 21 Oct 2020 18:20:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YYTinwLWuC8kOKRp2a5rcOnG2ad4NTAcj0QMBrR0zKU=; b=i5v4iyk6u+3v1jSCCImWDH2Jg bHDM8FovpeO9Sof8SiJAsW2mLdoIbffrmHvFH7sPeBerfuSzfjmzx7S/H8tZglL6fph4Wr6DOpPPs NSpX6Y4vn8CamN6txWr/Kz2liZlhhooBG81T/thBAOeRnhg0YSNlpQAVyv3XaTDJLEcoA6Irdj1Q6 G9T2jvM4gQbHh4I45YHaIIFQOikkQn7CHi35kSxyZjZMX0jaEmpo6TH1Uxl+GJVvOaoEE+zuzFP3R qw4YqKa/q5Q1KdruV8CH5xhnVPt+GF6s91xCeMSbbxWCvV6YU42Fo4dNHeRWb3fvEMqrsS+GGTcTj ZJRK/X2xw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nw-0007KO-AX; Wed, 21 Oct 2020 07:18:12 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nr-0007Ip-5h for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:08 +0000 Received: by mail-pj1-x1044.google.com with SMTP id k8so32173pjd.0 for ; Wed, 21 Oct 2020 00:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1wkZDhYATOwAPYhwd1Wg4TI6n5JJU5lMOuhYcvwcIiA=; b=L7+Qw5ppRBJqb5EqAwrizISqiH8NMM6Z0zbOvSuzxDsf3ZEEXnYaVvgvyLE7d9b14/ FgAYKjubWfvnSUVtCUSrHW9RiUzr3DNlEinaMekEWPevWoTS82PKslXhN13cvRFocR9+ ehsiEk3f1MgK1DOTDjvXE9231bIY3CX65jDE9Ef7E8H9bM+WDvzlLxXcn7ZInsR9zVKT maSIyQ4qodalDLdjx2Dg87WnayiejSwlRdOU7lYCxV7lQ4tBIXdFzSC4LSUlDc29uilF Zyai3/1LVqlCQPgF9F4R7Q8tR0XZStCv9vk82RcxZpZjGsM9eaOA//9um8GwTH5L8pqq 7HEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1wkZDhYATOwAPYhwd1Wg4TI6n5JJU5lMOuhYcvwcIiA=; b=AQN2nkV/vmTmYVTy0cCZ/Q9+f2aAfMwW0Rg4N5zJM046/XAvRHN0KqusHQoioasuAH NYSOXhRNQKL+w8cnDqvZ4N7Ti9IVwP0exk2LxkngTIGimoUPrpCTEjnhXacTPLgsaUxw FR89y8tCBdfzaNybey9VdlS2fowqH6kc1RGLiGkXziei4M2GI4J04wOdvIfJ1zGV29qw AVLspdD0GLAcT6Fz8TH8LkSzGlQx0j5ZJbNx/KmimMKAOsq5uCZhr+IS2XTD+dTDCr4T QHvXrc3liv6cejX0nOdaYVPM/2lJlAfMFiUSSmdE9JXNnT0F6LLjb8XbrREm6oq0AH27 cCsw== X-Gm-Message-State: AOAM532mH9yn+2Wy8iSv8INZhIRJEwRqXJtgqW6h871r8z1yQ4C8yHBH trLwDokWWq96iqcbFI38MXoR3xA1yx4= X-Google-Smtp-Source: ABdhPJwiQ0Rp9PvHyFazttpVvyQMNoVb+TWpvfpi0p6ipU/i7e4RtUCxgQ6ft8ii+uVPYkqirDmXNw== X-Received: by 2002:a17:90a:450d:: with SMTP id u13mr2010407pjg.148.1603264684962; Wed, 21 Oct 2020 00:18:04 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:04 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 4/8] generic: 5.4: make nf nat masquerade in unset state by default Date: Wed, 21 Oct 2020 15:17:39 +0800 Message-Id: <20201021071743.92801-5-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031808_138373_D629CF4D X-CRM114-Status: GOOD ( 12.36 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Upstream linux 5.1 commit d1aca8ab ("netfilter: nat: merge ipv4 and ipv6 masquerade functionality") replaces the following 2 options - CONFIG_NF_NAT_MASQUERADE_IPV4 - CONFIG_NF_NAT_MASQUERADE_IPV6 with CONFIG_NF_NAT_MASQUERADE. The new option is one without prompt and will be selected by CONFIG_NETFILTER_XT_TARGET_MASQUERADE introduced still later in 5.2. Signed-off-by: Yousong Zhou --- target/linux/generic/config-5.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 04fda5de24..b911efdf4e 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -3689,8 +3689,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_NAT_H323 is not set # CONFIG_NF_NAT_IPV6 is not set # CONFIG_NF_NAT_IRC is not set -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_MASQUERADE_IPV6=y +# CONFIG_NF_NAT_MASQUERADE is not set # CONFIG_NF_NAT_NEEDED is not set # CONFIG_NF_NAT_PPTP is not set # CONFIG_NF_NAT_PROTO_GRE is not set From patchwork Wed Oct 21 07:17:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385382 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=yAEBkj9a; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MEopByJv; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMn5qpKz9sPB for ; Wed, 21 Oct 2020 18:20:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6romgEFVNaoJ+3NCzSJAB0545XWEYHSBrywLE4IDCpI=; b=yAEBkj9a8sQ0NTkTTpI65AsIP 4v/7n5LnSnb1DirySjUP/RnypW+rIsRts1NqyWGP3X+hcEZjsLRrHQLF+9uKuKqG7pcDxyvuzn7pJ IkYC0+b0+0uiLBkEpis7vM/HHJW4X6AfP0Y8QWelwv3lGusdDosuICXmBapX510JBIn4a0/o3vgyO 8yluHUOn0XPJmEuGrCbI9CHnKUDiWSLOphhQKIcyftBDm5ktM3M5NNrs9uqNkEDqtTNrub/kiioac +KYfNKtcA+V6czU2ZKqIegXVJ7dhkgE+DG8Slgzd+DHUIkRXhz/5zxzGgOlaUf6ovgmOHtmbEVRtY ncNDWIZlA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Ny-0007Kw-H3; Wed, 21 Oct 2020 07:18:14 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nt-0007JO-OP for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:11 +0000 Received: by mail-pg1-x542.google.com with SMTP id l18so968957pgg.0 for ; Wed, 21 Oct 2020 00:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ztHiW02LYBhxBsxG0qj2dv7LanNp0pYn3ayYvNEOwCU=; b=MEopByJv+kB+xmFgWLp2iHX1NwZo3tHftyFNHlH4ZcxFyJB95Ah8MVcI4kqlEN2sMC pIFP6kA9bHMAFcRAbrzFRW1b06E/0pSfTlRTwF8YTTzQV7CGg+/GKJOmzPghjh5zsxiK 2PzNtdTeoyPa8YAHP6QhmaDT2cncE1l5Gc0FKSzvzqShAeJusyY6eP4c5+j7RliH9iiK joCROhU8fr1nc7xCcQnBm5ofb1c3/KlkPS3vzQSmN6bHdOEG+CUsCF4clFqu3tuWB2fK ty8/+z26B8F8xD7ZrSofR863oI8QSAZ0UJ7jjSAroAXbK6g96pl8F5zt0RX9gtcwllOK A8kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ztHiW02LYBhxBsxG0qj2dv7LanNp0pYn3ayYvNEOwCU=; b=S+pI+EILj29ZMqw9zYRlctxrHJZH+3smC/WPiXOxvPaT9bw/DXsRGyv96mxXcCONjA 9xB3M8t4XhaEie44TeA3HwndOryvRyWkyz8/55YEhDuniq/zc6bPxAhkCIn03Ehz70P/ Jknzfg2CzM/dk5qMWO/5e7XEfdD/ZTUtiqZSb2Ry6d1kfgSr4QLmF+xRB4gIEWCygwKd yGhefmfhcBV0sHZ892Gcve9525UrILSBoK85p8Yn7bYo3SWp+pfJ5trZC3W0fhlxwfXR N2+bVOh1eJ6/uihvVGr4m2KbP70yaEcS2zVBw7mC0iHHUHKwlQFxGiLqZXtGwiMs3XDO wRTw== X-Gm-Message-State: AOAM531QbKODAXYKTi9SN4RcSGEFYhgV3VkqjT1OWBcKD9CXET4ToUnJ 2tTGe8oDog1lVunsOz1P7hs9g7zoUAQ= X-Google-Smtp-Source: ABdhPJzgu5nRDfAejeXPH+6q45d/0kU6Wc1kuSruCIaLAiLI32An3EcVd17xdMI5hvLSOCve8C6exg== X-Received: by 2002:a65:68c6:: with SMTP id k6mr2109998pgt.231.1603264687178; Wed, 21 Oct 2020 00:18:07 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:06 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 5/8] netfilter.mk: add version conditional for CONFIG_NF_CT_PROTO_GRE Date: Wed, 21 Oct 2020 15:17:40 +0800 Message-Id: <20201021071743.92801-6-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031810_193699_AB3803FA X-CRM114-Status: GOOD ( 13.47 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:542 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Tony Ambardar Kernel commit 22fc4c4c9fd6 ("netfilter: conntrack: gre: switch module to be built-in") moved the CT GRE code into the core nf_conntrack.ko module and changed the CONFIG_NF_CT_PROTO_GRE option to boolean for kernel 5.1 and onwards. CONFIG_NF_CT_PROTO_GRE at the moment has no prompt and can only be selected by NF_CONNTRACK_PPTP Fixes: FS#2990 (partial) Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2990 Signed-off-by: Tony Ambardar [note that the option now can not be enabled on its own] Signed-off-by: Yousong Zhou --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 3c217db106..8776391f96 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -219,7 +219,7 @@ $(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf_conntrack_broadcast)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda)) -$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre)) +$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre, lt 5.1)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_H323, $(P_V4)nf_nat_h323)) From patchwork Wed Oct 21 07:17:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385383 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=xPkbJeKn; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ldEkeBtd; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMp11JRz9sSG for ; Wed, 21 Oct 2020 18:20:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AXRAtmt1tNq5IFx3wzf6CdJD7A1PNrvuYiWCsri4AMc=; b=xPkbJeKn1HajTxRuXJUesUPcj hKtT8eBaM4Y9fLZoknRj91KLWe/TFsJ1/If8GQjNfCsOG/UPEUj8NIhM1fDipxn90tgRe29TLchnI BDjS2Ugp77f0cqMDFCDKSrld9/SEiRh2ah7fweKaFuUxufeMU2Dr+ihYxbfU0xFbFzJgmpH7SgU7Z CxVnFTR1o0L7VmUfGNBVKOlVV6Zs6oOZtkB4RF8Q/kUkVsrrFOFOJFTRuPKq0XyzN/IzEs33Lw2uD hQHKGvjaCq3CK2HCcu9OmQE93ep2KPxHvvYxb0btS4hBSXmGyQe8yTHw4r8v0jzuJ/g/JKJyqyWsZ Uv351eGkA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8O0-0007Ld-Bu; Wed, 21 Oct 2020 07:18:16 +0000 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nv-0007Jz-QL for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:12 +0000 Received: by mail-pl1-x62c.google.com with SMTP id d23so752536pll.7 for ; Wed, 21 Oct 2020 00:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GJfXdyXQgk/6J5OtqNBBcLdZ3APrPsZFkYHmDP0pb9Y=; b=ldEkeBtdEJEAimZ5dV7M7T39SEEchf5mHzJRXJHCGWJIkGxKltuJ74kBBibAiJM/y1 FQzoVoWQ9vWkFoe9B+ZCT0lOjn3yvqwfED/rcLvpk70wLHlw+EHfudsglFu8yyk2jWm2 GLtV2B23ufi/sHai9qEuNKn/DJGPQUjRM6s8X1hKIfuR7Zj1n9ZIemqysmZpQjqynMEE j0biTXw9txvclmlkhK7o/8QFk3N2xFnZfkdOs930TWtaPA3m+THUpsEhOZpZ9BuZ0IFR QmkVD4Ew5eMDFehbq54uo8fQWulmZd2JCLg6k6WMBVZyq07M39amPuOznscOJcnf88Vm 6c7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GJfXdyXQgk/6J5OtqNBBcLdZ3APrPsZFkYHmDP0pb9Y=; b=kjDPk53u9BuCZvsdqvplgFGgSDFhqXWbqspeI3INxoUUVR4HHbzdrLL27GGn04kXv8 d43eGt/A8LqPc8WGelPnd2LIuO/j+d1WpSQkKzHxQKtEaeRZTpSJdxGfpRsMygxG8WgM KVpaFp/4fv//loM2RHmIGqUKd3yEHGzKDsNB02dGEM2IltToJD/AVYhSe5oKitnYKc2n IRZOIecgktB3pgBFVBJ7ALhpryHLUTwtQto8uA9SyRLMozImzlutwc/o+PiUzYGt+JOP 62rW2YaBe5Wc1EpIQV6qAn6saSOVul3uNkjP+982HB0QCaUplM4y6o3CwqUXmxVaF/3V zfgg== X-Gm-Message-State: AOAM531l4TaDxJMt3WwFZ6jM/V/sAfd6cpSWA4/jc9uoZjJW9+Sz+sHv 5UWU/zOoQh/5XjNmqms01SMoaliIcbQ= X-Google-Smtp-Source: ABdhPJxQH2U5BA6CEWEneLmeFYYle3TMF6paeHnm4paotmNcYAEneY4SszeJcRj8viX8xfgG5Tnelw== X-Received: by 2002:a17:90a:6d8f:: with SMTP id a15mr1946286pjk.186.1603264689432; Wed, 21 Oct 2020 00:18:09 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:08 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 6/8] netfilter.mk: add version conditional around CONFIG_NF_NAT_PROTO_GRE Date: Wed, 21 Oct 2020 15:17:41 +0800 Message-Id: <20201021071743.92801-7-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031811_927418_D37EE730 X-CRM114-Status: GOOD ( 11.06 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62c listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org It was removed in upstream linux commit faec18db ("netfilter: nat: remove l4proto->manip_pkt"). This happened since linux 5.0 Signed-off-by: Yousong Zhou --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 8776391f96..02173d4355 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -220,7 +220,7 @@ $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre, lt 5.1)) -$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre)) +$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre, lt 5.0)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_H323, $(P_V4)nf_nat_h323)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_PPTP, $(P_XT)nf_conntrack_pptp)) From patchwork Wed Oct 21 07:17:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385386 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=oKeuOAeV; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LsJSYF15; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMN45Zvxz9sPB for ; Wed, 21 Oct 2020 18:20:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/GMmwUlHIpUsm7A2iuFwoipqojqbvIDfFbaK+FKEj2Y=; b=oKeuOAeVrHbOQFLQCoSqWWYzN LDkQiDmt1XJ2jOhUSxzXI+8l5Z6LCO1xm5teaY0rYQfwmzOosK68lMVKKYeSM1QxzxVV4Bjwhyi/0 zG2V5gX+KP9mUvCqfXJ6DFiAj+YpppolwePDCn6XqTV2Mtt2N/bpfEdxISNq2TEMLUNiJ7AamRahd s40p5TI6Jr7am/vffZ6aYcW3ejjDAXlhSZxYwCHRpR/tmY2TVqnVhKEYWe8teOehkTqFqupWhK6mv 9XSyF3QURLmmPJIljAzT9dqnivkhgr62oIdmeifU1e2NEvlPmhRf8vxOMs9wotJ2A8tQ04ihQ2u2X rwCuCjw7Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8O3-0007ML-BK; Wed, 21 Oct 2020 07:18:19 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nx-0007Ki-Tz for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:15 +0000 Received: by mail-pj1-x1044.google.com with SMTP id lw2so678988pjb.3 for ; Wed, 21 Oct 2020 00:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O7emO7NXZkoQdV5g+QXyATCLBjU5LpGBHX/8tWA/P3M=; b=LsJSYF155BOmms6X3wRCR2sU/Jrlcp4NOxKTJ+AOHqWCagDT71kO5AGxpuq99Ej/u1 bAHaW8d1WaeoEQ4KrdJunkNGix2v860feTYavWeIKyIMMXPgXNx95Oz0wOZAKNJKCjCr yabtR5gNQMOggayTyzW86zg9SFbH1JnjbCqVF0iTgXRQa5NoyVZBSffCLseVcgiE3F78 LEF2SxL//7Iu25xVCVIhVBW2XJCd5R8A+C0Xe7B2fEb1rC1iBygpePTnOzaLchTp/ovg 5VrAtr9FIDD4Pi5++21lAkHpHYCElA7k+lrQ3hNrr9IVguwS9D70ZeMZF1hz3MzYyN/g Fe8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O7emO7NXZkoQdV5g+QXyATCLBjU5LpGBHX/8tWA/P3M=; b=FBQMK93HJ8eXyv9mX3VsAayBidFZ4rBQ5D/o2BuSthpLK/r0HT81g6+e/zG99HrCCD wVyChd7fqPO3uoaAGbHmg9jIlG9QbsZAMRI09y3xFauhHeRyeG3rHszUEpFPktVXYvBj Wmbkd/VqRfd70lz2+Kpt5WrHKwIChp851c4b7lHJJJ+vkYIvovi6iJdefQTkTW4VkOVF Aq7lqIUE0mPj3MKvfUMtqnubQ0BKL+dx+egIkfvO+/OnXBb7S8Qn9Yw0oy1/aE60tJLX MewoNNojO9WNfIaFbmayxhFLmbp3OrGY4a7gYzcYKazdpD5xnv4BneT2vwjRV7qvPFD4 JglA== X-Gm-Message-State: AOAM533lPqvTw2+wJv1wdQiYxcAv/e4FjmWOOTbdlGrnwgPW/cG9DZvc FvMaHcbWGWVbdzzNDZq/hMhQjOJRm0c= X-Google-Smtp-Source: ABdhPJxVZ0zrvYC6J7Zyvfi716NCFXK1Yv720piXmvCR6FmyRAOneFRyAOb56Q4gm6bH5ZGg9i4fAQ== X-Received: by 2002:a17:90a:6b08:: with SMTP id v8mr1996555pjj.126.1603264691809; Wed, 21 Oct 2020 00:18:11 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:11 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 7/8] netfilter.mk: add version conditional around nf_nat_redirect mod Date: Wed, 21 Oct 2020 15:17:42 +0800 Message-Id: <20201021071743.92801-8-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031814_002806_DAE0DE84 X-CRM114-Status: GOOD ( 12.02 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Kernel commit 1ac89d20150e ("netfilter: nat: merge nf_nat_redirect into nf_nat") made the redirect module part of the nat core and changed the CONFIG_NF_NAT_REDIRECT option to a boolean, without prompt, affecting kernel 4.18 onwards. CONFIG_NF_NAT_REDIRECT now can only be selected by CONFIG_NFT_REDIR or NETFILTER_XT_TARGET_REDIRECT Fixes: FS#2476 Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2476 Fixes: FS#2990 (partial) Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2990 Signed-off-by: Tony Ambardar [note that the option has no prompt and can only be selected by other kconfig options] Signed-off-by: Yousong Zhou --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 02173d4355..0c29c0bd04 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -184,7 +184,7 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt)) # kernel only $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect, lt 4.18),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, lt 5.1))) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, lt 5.1))) From patchwork Wed Oct 21 07:17:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385376 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Kr3qHkXz; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=GN+3rs+y; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMZ11jrz9sSG for ; Wed, 21 Oct 2020 18:20:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mTqu4Bt85JHquzPIPJxMIRPA8d6rnIj+YXpKUMsmkv8=; b=Kr3qHkXzn8qOInElxbJiUTz44 ZnIFvip9/q02XTuyPJbVJNCZod1fhmdeGbTwp4p8hZmM0Hem1rk1BAqLEQeLZg6yTbkTqpqiTAK2D SCcLoVLw789xXc6E2Diru/SVox/PCdKfRAjXHzpHgVNu43iyYNCShof0loGLBiB0P5GDRMKYXlfOA juxpZpMAYhHmnbQHErMtTiGRi/wst+TVZpMb1NGAjnZR34MU2zMrJvjgqxI1v1UU5n1GDHSVYQ6ED MITaZWLH3pFPNY+8xZd06xjCdzsWjWLadWRdwkL4iQgsASQgIRbBFMZvsWePFgUVHb552pPPtwQIr rxUPR42Zw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8O8-0007Ns-8w; Wed, 21 Oct 2020 07:18:24 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8O0-0007LM-6l for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:17 +0000 Received: by mail-pj1-x1044.google.com with SMTP id ds1so682059pjb.5 for ; Wed, 21 Oct 2020 00:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oV2X+tHqx0Dhi6GuFlsjPXF73k4vccjEUUr0tBWYMys=; b=GN+3rs+yqWu1CsVv68dGeYKIrCcPFNBs5xpO/Hesp4mfEmJgfltpas0Yv8joPDrUaV zSO5sTu++7SQ3j0I5n8aZp00KdCJh107XmnjpeRP23i37wFfhI8GQ2BI1G8VwRseVj2v SdtmVPsHHlxxNxNCivmDH/PcrqJ0/wxW7xNCPnGqGH1+F8Pv6UekyRtwCf8anq8nGyqJ 1KZQE7pArdMXfAWvymPue/iwTfudYefAuKbtWU9dEIz4ra+nCQrRze0rKdv2J7jzl+ua ZTLpCoBiOYsCaVyFa4nvw969qq8qX49aMAAu/LPDXTuEYPhCX7G/Xw6Pn3Z2aGooUfjw 1Pxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oV2X+tHqx0Dhi6GuFlsjPXF73k4vccjEUUr0tBWYMys=; b=X0qLCmQ6tx5OD0xGjsf/pxzAiwqDQGa0ai48xbGEMm/5T0n6qGcABQILvMf9SilVV+ BE809fKxV4aqvcAdaQY0aHBxqPYD+19+SlpXYK7COgUTJy1hwYCn16x6YTO2QAefdc9d 4XCNeuPppfnj5xCwBqc217MaeEDqKR52jR6yXXZEg6wavHaelZFkZGj9GXoifduQEHX3 cynHt2c6gda66DV/lYbvITqWmidsKeuIiyz7+QzzibxUbXInXiFePmBnPSt65cnVICDT df+vCHn4ieuhsSpJVXQ3gUGALuHMoc88isYq0pxpbcvemttibQASZxibKCXp5Zd9t7ia twJQ== X-Gm-Message-State: AOAM532wIYMx31eob3BIPCdkwb5qRmih0vKVCHZUvn+AVfAuq+/4nEfs 4V+AHJe5ywbP6Z2Ycy1SldWXJPbnG7w= X-Google-Smtp-Source: ABdhPJxw1gygBe6Spb1ECdqU4Kx68+DQBbarppFBTmwl1u5r3NgWnF9wFhQRGAh1pNTIa1x0WT5KQw== X-Received: by 2002:a17:902:c383:b029:d3:d17a:1de with SMTP id g3-20020a170902c383b02900d3d17a01demr1879765plg.84.1603264694151; Wed, 21 Oct 2020 00:18:14 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:13 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 8/8] netfilter.mk: remove now obsolete kmod nf_nat_redirect Date: Wed, 21 Oct 2020 15:17:43 +0800 Message-Id: <20201021071743.92801-9-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031816_278748_0660F07E X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Now that the minimal kernel version maintained here is 4.19 Signed-off-by: Yousong Zhou --- include/netfilter.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 0c29c0bd04..2c71c07056 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -184,7 +184,6 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt)) # kernel only $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect, lt 4.18),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, lt 5.1))) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, lt 5.1)))