From patchwork Tue Oct 13 12:30: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: 1381552 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=Yqp6HGiG; 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=FpL74bbS; 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 4C9ZhG6lXSz9sRK for ; Tue, 13 Oct 2020 23:33:02 +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=Yqp6HGiGm/RLRx6bdAAf220OD NKta4mDCdaxWAiFtyDRGBPi8nOhFOquetaZ2Kg/4A+CdIQ2qDxM0OHNukLS/88zzc/WEahpjpeOee 4aFxWUaE0AAiSr0ym4j/BAkYAAU+/URVbEIpBbD7nFtxguQy2dIH5mQ0zOgjWxAunEdcKoAyl8mzN OxiUSuZdQE8B2/7NxPV4229OTH3ljRASvA139PiOLCysXeA0abS2n01av3Ea11xiW9kMq9YMt2PfT 9cs4BoEMq9VZD72L7LcYEy7PCdr+Sc9kGrj0/2k748uK44w7+re4RH9P5GXL8m1iIxFWIC560tth+ Ivhtt5kAQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSN-0004Qh-Ct; Tue, 13 Oct 2020 12:31:07 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSK-0004PZ-52 for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 12:31:04 +0000 Received: by mail-pl1-x642.google.com with SMTP id t18so10614852plo.1 for ; Tue, 13 Oct 2020 05:31:03 -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=FpL74bbSkZGIzgIs9s6Lc9az9+DudMHaMPC0mnn77u4eJji4w4yKccuAcnC/U3wg7h EaZt5CXChcfQs9cmpWw+OaaqmpbHxP2F0DNJ6rHct3bTD6fToFXpu7q15moalgX4yV6B pKxr2zqOJ1i2MP/QmGcaiu8gW2gdNdxfe1G9HOReoXfteTD+cdH5g6KE1GqdvK9VpQrn qrXwVDwcFtRZenYyZKIzK0i9paqE11T4ALvk7IE2fZLcynjrS30yrQLKr4qtFsyuUWjy 36ihctTLKALgDPjXh7zvIcjkuHkSfYfSuUD/x/mwUmtPlimbOdnEgw9oFnaNxPvGn/SK Uzww== 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=AhzEziahgdGO9oGcOZvOd0sL87DR37w7OfPTVYMlglUoIEd8nCyp9wFzXs12MrsftN dIDX+5/cB8O2NYyYL3jWtMc9OuM3WhnXnoJNfPABWjRXwJ5IfecnMnPcXr9fIIho9Qd5 MP1LkEd+Qc4HPEE50FmqROtOhU9WOHEDp1abTWsoK3uhIulLtCkjY0rRWygUAq0+Bmn1 3rXR9ohLA+EzCU8m3wL64ZlJA200tBH8GtIiHClbJ6Kpy9jMq2GuySYsFueu8ALoxpMD G++Q5PAUtmOw39gyBrPsTy1d7oloZ6b8rb9zGGm52mxyo18tCRFgpQNYaXLUA4k3bjLu lskg== X-Gm-Message-State: AOAM531h0FgQ8ypuotDj3hToWiBz5Hx+AttoSFXhoGGGrEJpefdk5AOS a1Isw/z+rmKUY3vz3DY0vf6DEUQJqK4= X-Google-Smtp-Source: ABdhPJwQn/mqagDEktB3CeeDpgLzENZTIc0PlCflwtsiwQc9Ow/o2L94KAGD9UFi1Xoi+UJ2sMsKEQ== X-Received: by 2002:a17:90a:64ce:: with SMTP id i14mr25249986pjm.97.1602592261820; Tue, 13 Oct 2020 05:31:01 -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.31.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 05:31:01 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH 2/7] netfilter.mk: use CONFIG_NETFILTER_XT_TARGET_REDIRECT Date: Tue, 13 Oct 2020 20:30:42 +0800 Message-Id: <20201013123047.117135-3-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_083104_217939_82A51F58 X-CRM114-Status: GOOD ( 11.62 ) 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:642 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou 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