From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9439C43334 for ; Wed, 6 Jul 2022 21:54:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232062AbiGFVya (ORCPT ); Wed, 6 Jul 2022 17:54:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230412AbiGFVy3 (ORCPT ); Wed, 6 Jul 2022 17:54:29 -0400 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B71B275D8 for ; Wed, 6 Jul 2022 14:54:28 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1o9CyY-0006vj-Nc; Wed, 06 Jul 2022 23:54:26 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nft] scanner: allow prefix in ip6 scope Date: Wed, 6 Jul 2022 23:54:21 +0200 Message-Id: <20220706215421.32531-1-fw@strlen.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 'ip6 prefix' is valid syntax, so make sure scanner recognizes it also in ip6 context. Also add test case. Fixes: a67fce7ffe7e ("scanner: nat: Move to own scope") Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1619 Signed-off-by: Florian Westphal --- src/scanner.l | 2 +- tests/shell/testcases/parsing/prefix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 tests/shell/testcases/parsing/prefix diff --git a/src/scanner.l b/src/scanner.l index 5741261a690a..1371cd044b65 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -403,7 +403,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) } "log" { scanner_push_start_cond(yyscanner, SCANSTATE_STMT_LOG); return LOG; } -"prefix" { return PREFIX; } +"prefix" { return PREFIX; } { "snaplen" { return SNAPLEN; } "queue-threshold" { return QUEUE_THRESHOLD; } diff --git a/tests/shell/testcases/parsing/prefix b/tests/shell/testcases/parsing/prefix new file mode 100755 index 000000000000..4580d6b8b37f --- /dev/null +++ b/tests/shell/testcases/parsing/prefix @@ -0,0 +1,6 @@ +#!/bin/bash + +$NFT add table ip6 t || exit 1 +$NFT add chain ip6 t c || exit 1 +$NFT add rule ip6 t c 'snat ip6 prefix to ip6 saddr map { 2001:db8:1111::/64 : 2001:db8:2222::/64 }' +$NFT delete table ip6 t || exit 1 -- 2.35.1