From owner-dev-commits-src-all@freebsd.org Fri Jun 18 10:07:27 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4CA93641A42; Fri, 18 Jun 2021 10:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G5vjq1jv2z3kMX; Fri, 18 Jun 2021 10:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23E34209BD; Fri, 18 Jun 2021 10:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15IA7ROl037829; Fri, 18 Jun 2021 10:07:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15IA7REH037828; Fri, 18 Jun 2021 10:07:27 GMT (envelope-from git) Date: Fri, 18 Jun 2021 10:07:27 GMT Message-Id: <202106181007.15IA7REH037828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lutz Donnerhacke Subject: git: 95f8bb6d06d9 - stable/11 - ipfw.8: synopsis misses nat show form MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: donner X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: 95f8bb6d06d9fb65dc382423485f2f636ec20375 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 10:07:27 -0000 The branch stable/11 has been updated by donner: URL: https://cgit.FreeBSD.org/src/commit/?id=95f8bb6d06d9fb65dc382423485f2f636ec20375 commit 95f8bb6d06d9fb65dc382423485f2f636ec20375 Author: Lutz Donnerhacke AuthorDate: 2021-05-10 16:30:42 +0000 Commit: Lutz Donnerhacke CommitDate: 2021-06-18 10:06:42 +0000 ipfw.8: synopsis misses nat show form Document the existing behavior, which is currently only available by reading third party documentation or the source code itself. PR: 254617 Submitted by: Oliver Kiddle Differential Revision: https://reviews.freebsd.org/D30189 (cherry picked from commit c8250c5ada85fec8936e8eb8695d7cb80a3ce8ab) --- sbin/ipfw/ipfw.8 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 4cdd7b63849f..93c265512ce1 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,7 +1,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 11, 2021 +.Dd June 4, 2021 .Dt IPFW 8 .Os .Sh NAME @@ -105,6 +105,11 @@ in-kernel NAT. .Ar number .Cm config .Ar config-options +.Nm +.Cm nat +.Ar number +.Cm show +.Brq Cm config | log .Ss STATEFUL IPv6/IPv4 NETWORK ADDRESS AND PROTOCOL TRANSLATION .Nm .Oo Cm set Ar N Oc Cm nat64lsn Ar name Cm create Ar create-options @@ -922,7 +927,7 @@ This makes the .Xr netstat 1 entry look rather weird but is intended for use with transparent proxy servers. -.It Cm nat Ar nat_nr | tablearg +.It Cm nat Ar nat_nr | global | tablearg Pass packet to a nat instance (for network address translation, address redirect, etc.): @@ -3243,8 +3248,9 @@ Obey transparent proxy rules only, packet aliasing is not performed. Skip instance in case of global state lookup (see below). .El .Pp -Some specials value can be supplied instead of -.Va nat_number: +Some special values can be supplied instead of +.Va nat_number +in nat rule actions: .Bl -tag -width indent .It Cm global Looks up translation state in all configured nat instances. @@ -3270,7 +3276,7 @@ For more information about aliasing modes, refer to .Xr libalias 3 . See Section .Sx EXAMPLES -for some examples about nat usage. +for some examples of nat usage. .Ss REDIRECT AND LSNAT SUPPORT IN IPFW Redirect and LSNAT support follow closely the syntax used in .Xr natd 8 .