summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorPhilipp Buehler <pb@cvs.openbsd.org>2002-07-30 16:35:16 +0000
committerPhilipp Buehler <pb@cvs.openbsd.org>2002-07-30 16:35:16 +0000
commite645a5dbeed05da5bdc63f733eff32e093721dae (patch)
tree8b31cdb82b3c8ed1dd84f642bb93f5ab225993c0 /share
parent2f02806db2148e7f29e7c3c967d54e9f9980676e (diff)
BNF catchup and consolidation of interface name handling:
ok henning@, dhartmei@
Diffstat (limited to 'share')
-rw-r--r--share/man/man5/pf.conf.515
1 files changed, 7 insertions, 8 deletions
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index f78ec1fd299..83de8c1f429 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pf.conf.5,v 1.73 2002/07/30 13:53:57 pb Exp $
+.\" $OpenBSD: pf.conf.5,v 1.74 2002/07/30 16:35:15 pb Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
.\" All rights reserved.
@@ -972,9 +972,7 @@ option = set ( [ "timeout" ( timeout | "{" timeout-list "}" ) ] |
pf_rule = action ( "in" | "out" )
[ "log" | "log-all" ] [ "quick" ]
- [ "on" ( interface-name | "{" interface-list "}" ) ]
- [ route ] [ af ]
- [ protospec ]
+ [ "on" ifspec ] [ route ] [ af ] [ protospec ]
hosts
[ user ] [ group ] [ flags ]
[ icmp-type | ipv6-icmp-type ]
@@ -983,13 +981,13 @@ pf_rule = action ( "in" | "out" )
[ "max-mss" number ] [ "allow-opts" ]
[ "label" string ] .
-nat_rule = [ "no" ] "nat" "on" [ "!" ] ifname [ protospec ] hosts
+nat_rule = [ "no" ] "nat" "on" ifspec [ protospec ] hosts
[ "->" address [ portspec ] ] .
-binat_rule = [ "no" ] "binat" "on" ifname [ "proto" ( proto-name |
+binat_rule = [ "no" ] "binat" "on" interface-name [ "proto" ( proto-name |
proto-number ) ] "from" address "to" ipspec [ "->" address ] .
-rdr_rule = [ "no" ] "rdr" "on" [ "!" ] ifname [ protospec ] "from" ipspec
+rdr_rule = [ "no" ] "rdr" "on" ifspec [ protospec ] "from" ipspec
"to" ipspec [ portspec ] [ "->" address [ portspec ] ] .
action = "pass" | "block" [ return ] | "scrub" .
@@ -999,7 +997,8 @@ return = "return-rst" [ "(" "ttl" number ")" ] |
"return-icmp6"
[ "(" ( icmp-code-name | icmp-code-number ) ")" ] .
-interface-list = interface-name [ "," interface-list ] .
+ifspec = ( [ "!" ] interface-name ) | "{" interface-list "}"
+interface-list = [ "!" ] interface-name [ "," interface-list ] .
route = "fastroute" |
"route-to" "(" interface-name address ")" |
"route-to" interface-name |