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)))