Message ID | 20201013123047.117135-2-yszhou4tech@gmail.com |
---|---|
State | Superseded, archived |
Delegated to: | Yousong Zhou |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> 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=<UNKNOWN>) 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=Q1kbycp2; 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=dTIBBjAl; 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 4C9ZhJ09Xjz9sRK for <incoming@patchwork.ozlabs.org>; Tue, 13 Oct 2020 23:33:03 +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=Q1kbycp2qvrg19gs8g8qNN9MY m2jdOkSaEM/275HKv/A4SJOROKQ+HhSSBEIP/iroHn11S+sy8ZBKAhOrsAt2z+yuHUrqJTu0tPbic NvvyqZr0TjThb71BXq9pP2ipgoNkt9amU7JfCiZ2lVDY32MIfQPeJ4dnGI5YygZTbpIxI+KX2bqUs RgAU7EvJikG1B+OVF0j5PmT1iQYQucpPpHiSgYwVPMkVs92rSyMKD7UC+vOz60/0zpnTDAoHOkgoW N09wrU4XZIiQNj21ARE3bYaZpQo/sz6JVui0GLoHW7GyXdNs1PX1IjXmdUwlJUv813tznVDEqQtD2 pA47nRkOA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSK-0004Q6-Sz; Tue, 13 Oct 2020 12:31:04 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSI-0004Os-AO for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 12:31:02 +0000 Received: by mail-pf1-x444.google.com with SMTP id y14so16616918pfp.13 for <openwrt-devel@lists.openwrt.org>; Tue, 13 Oct 2020 05:31:01 -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=dTIBBjAlLLufoBE7ZbW953bl4jkkzW2rtD9qwtLeM6qZwJ3dMoc7JZHGNX4HgDPyi8 qJsUpVTJQMrOWekxAVoU5iIzW5ujuEqpyDMzyNLFJuqKIAuwJWXSoh8AbXmFFK7Eup1t MD8p/rYsm3bLIikSTIo9GASW8hUN8C/lpBJfXnJbBN+4zq9CuhIfNdqLdqF8bvhAvbDa nFs1fZQCon+5Qm4fh3qhPMY4bPEWcyxZfsU/zvMrQKLcg5nakO2IaFV9zEMyl6siC8hZ 0UcOvtMDDAwfUCGmk6OOHSzg8X+Ewu03LGI4Vx6X92zIyWXcl2TOvDwQQ84tOfg+OZdL jYtg== 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=LsuSQw1c8/pFOi/guA0FjmCAd/CRKkFDsWDWEgBMgcadUOCYo7dWcv0zq5A+gPSWbc cOr7Gcs4BmyOpJij5qML3GCVBPU2meANNSwqpNT/r2zbaz/rl/j8WpDYAsE1WVy5VzXy u6PkkevBEwOl13vCdl4iCyM0WLqLsaEW+ESeSTSH5Zvek4xoXinmlLPd6jAnHJFLodj2 Hkfh9njxT3e7qP5WHQ2/HaNaUJGfcEKilFBwzkcYih5yhyxWUGo1F8ezJL+aJWgkaHOW ocMI/CchShSG70aHE1KspxLBjntXTVgQxVMJSUZ5Wge2dFWQq0rI6bYtHBhyVg1MXxr9 r+wg== X-Gm-Message-State: AOAM530TM1dmDGCcabMb3iPeTHCgK9H9Pe9ZY66teRJw6bxpsjVZF5mS xBV3z2jJeTQkIYwk793WpNm0YwdpwEY= X-Google-Smtp-Source: ABdhPJwPVrftRtPnLKHEwj0AZwmj47AxeoLCwS530zLUjULgEMfwvk0tSfzGEczFZh9UMgepU+5pMg== X-Received: by 2002:aa7:8ad5:0:b029:142:2501:34df with SMTP id b21-20020aa78ad50000b0290142250134dfmr28555399pfd.56.1602592259748; Tue, 13 Oct 2020 05:30:59 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id t13sm23354657pfc.1.2020.10.13.05.30.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 05:30:59 -0700 (PDT) From: Yousong Zhou <yszhou4tech@gmail.com> To: openwrt-devel@lists.openwrt.org, Tony Ambardar <itugrok@yahoo.com> Subject: [PATCH 1/7] netfilter.mk: use CONFIG_NETFILTER_XT_TARGET_MASQUERADE Date: Tue, 13 Oct 2020 20:30:41 +0800 Message-Id: <20201013123047.117135-2-yszhou4tech@gmail.com> In-Reply-To: <20201013123047.117135-1-yszhou4tech@gmail.com> References: <20201013123047.117135-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201013_083102_388893_709A453A X-CRM114-Status: GOOD ( 11.52 ) 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:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Yousong Zhou <yszhou4tech@gmail.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
netfilter: kconfig symbol updates
|
expand
|
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))
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 <yszhou4tech@gmail.com> --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)