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 BEE23C43219 for ; Thu, 29 Sep 2022 13:01:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235629AbiI2NB1 (ORCPT ); Thu, 29 Sep 2022 09:01:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235589AbiI2NBX (ORCPT ); Thu, 29 Sep 2022 09:01:23 -0400 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16964145CA1 for ; Thu, 29 Sep 2022 06:01:21 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1odtAE-00031R-TR; Thu, 29 Sep 2022 15:01:18 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nft 0/3] vlan followup fixes Date: Thu, 29 Sep 2022 15:01:10 +0200 Message-Id: <20220929130113.22289-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 vlan header matching in ip/ip6/inet families may not work, because default behaviour is to remove the vlan header/tag information. Update documentation to mention this. Furthermore, dependency generation was broken so that even if the vlan striping is disabled matching did not work, as the offset was not computed correctly. Add test cases for this too. Florian Westphal (3): doc: mention vlan matching in ip/ip6/inet families evaluate: add ethernet header size offset for implicit vlan dependency tests: py: add vlan test case for ip/inet family doc/payload-expression.txt | 8 +++++++ src/evaluate.c | 20 ++++++++++++++++- tests/py/inet/ether.t | 6 ++++++ tests/py/inet/ether.t.json | 32 ++++++++++++++++++++++++++++ tests/py/inet/ether.t.payload | 20 +++++++++++++++++ tests/py/inet/ether.t.payload.bridge | 16 ++++++++++++++ tests/py/inet/ether.t.payload.ip | 20 +++++++++++++++++ 7 files changed, 121 insertions(+), 1 deletion(-) -- 2.35.1