Module Name: src
Committed By: maxv
Date: Fri Aug 31 11:18:35 UTC 2018
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
rename net-seg -> map-seg, and document it
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/usr.sbin/npf/npfctl/npf.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.69 src/usr.sbin/npf/npfctl/npf.conf.5:1.70
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.69 Fri Aug 31 11:11:21 2018
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Fri Aug 31 11:18:35 2018
@@ -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 @@ table-def = "table" table-id "type" ( "h
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 @@ family-opt = "inet4" | "inet6"
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