From patchwork Wed Jun 28 10:14:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 781544 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wyJYL2N2lz9s74 for ; Wed, 28 Jun 2017 20:14:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751919AbdF1KON (ORCPT ); Wed, 28 Jun 2017 06:14:13 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:33454 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751899AbdF1KON (ORCPT ); Wed, 28 Jun 2017 06:14:13 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2) (envelope-from ) id 1dQ9yA-0001rm-N7; Wed, 28 Jun 2017 12:13:10 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH 17/17] doc: update man page Date: Wed, 28 Jun 2017 12:14:10 +0200 Message-Id: <20170628101410.29134-7-fw@strlen.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170628101410.29134-1-fw@strlen.de> References: <20170628100659.26976-1-fw@strlen.de> <20170628101410.29134-1-fw@strlen.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org you can now use "rt ip|ip6 nexthop" and "ct original|reply ip|ip6 saddr|daddr" to tell nft if you want to match ipv4 or ipv6. Signed-off-by: Florian Westphal --- doc/nft.xml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/doc/nft.xml b/doc/nft.xml index 970acb541e00..99cdfe42c633 100644 --- a/doc/nft.xml +++ b/doc/nft.xml @@ -492,7 +492,6 @@ filter input iif $int_ifs accept hybrid IPv4/IPv6 tables. The meta expression nfproto keyword can be used to test which family (ipv4 or ipv6) context the packet is being processed in. - When no address family is specified, ip is used by default. @@ -2265,8 +2264,8 @@ filter output rt classid 10 # IP family dependent rt expressions ip filter output rt nexthop 192.168.0.1 ip6 filter output rt nexthop fd00::1 -inet filter meta nfproto ipv4 output rt nexthop 192.168.0.1 -inet filter meta nfproto ipv6 output rt nexthop fd00::1 +inet filter output rt ip nexthop 192.168.0.1 +inet filter output rt ip6 nexthop fd00::1 @@ -3385,8 +3384,6 @@ ip6 filter input frag more-fragments 1 counter l3proto protocol - saddr - daddr proto-src proto-dst bytes @@ -3395,6 +3392,22 @@ ip6 filter input frag more-fragments 1 counter zone + + ct + + original + reply + + + ip + ip6 + + + saddr + daddr + + +