Message ID | 20201021071743.92801-2-yszhou4tech@gmail.com |
---|---|
State | Accepted |
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=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 <incoming@patchwork.ozlabs.org>; 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 <openwrt-devel@lists.openwrt.org>; 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 <yszhou4tech@gmail.com> To: openwrt-devel@lists.openwrt.org, Tony Ambardar <itugrok@yahoo.com> 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 <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>, Adrian Schmutzler <mail@adrianschmutzler.de> 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(-)