Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/npf/npfctl rename net-seg -> map-seg, and document it



details:   https://anonhg.NetBSD.org/src/rev/3e64d5289edd
branches:  trunk
changeset: 993215:3e64d5289edd
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Aug 31 11:18:35 2018 +0000

description:
rename net-seg -> map-seg, and document it

diffstat:

 usr.sbin/npf/npfctl/npf.conf.5 |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r a747bd0630a5 -r 3e64d5289edd usr.sbin/npf/npfctl/npf.conf.5
--- a/usr.sbin/npf/npfctl/npf.conf.5    Fri Aug 31 11:11:21 2018 +0000
+++ b/usr.sbin/npf/npfctl/npf.conf.5    Fri Aug 31 11:18:35 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: npf.conf.5,v 1.69 2018/08/31 11:11:21 maxv Exp $
+.\"    $NetBSD: npf.conf.5,v 1.70 2018/08/31 11:18:35 maxv Exp $
 .\"
 .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -408,11 +408,12 @@
 map            = "map" interface
                  ( "static" [ "algo" map-algo ] | "dynamic" )
                  [ map-flags ] [ proto ]
-                 net-seg ( "->" | "<-" | "<->" ) net-seg
+                 map-seg ( "->" | "<-" | "<->" ) map-seg
                  [ "pass" [ proto ] filt-opts ]
 
 map-algo       = "npt66"
 map-flags      = "no-ports"
+map-seg                = ( addr-mask | interface ) [ port-opts ]
 
 # Rule procedure definition.  The name should be in the double quotes.
 #
@@ -448,11 +449,11 @@
 proto-opts     = "flags" tcp-flags [ "/" tcp-flag-mask ] |
                  "icmp-type" type [ "code" icmp-code ]
 
-addr-mask      = addr [ "/" mask ]
 filt-opts      = "from" filt-addr [ port-opts ] "to" filt-addr [ port-opts ]
 filt-addr      = [ "!" ] [ interface | addr-mask | table-id | "any" ]
 
 port-opts      = "port" ( port-num | port-from "-" port-to | var-name )
+addr-mask      = addr [ "/" mask ]
 .Ed
 .\" -----
 .Sh FILES



Home | Main Index | Thread Index | Old Index