diff options
| author | Philipp Buehler <pb@cvs.openbsd.org> | 2002-11-19 10:29:11 +0000 |
|---|---|---|
| committer | Philipp Buehler <pb@cvs.openbsd.org> | 2002-11-19 10:29:11 +0000 |
| commit | 80ef01c4fd9f4a9191592d17b9b20328a23cea85 (patch) | |
| tree | d4f9a1f8e6be73ee4b03eedb3fa62468b724b6f3 /share | |
| parent | 85c10def3b855aaae54a5d9a7b21feb4c27f6437 (diff) | |
first catch up with altq merge:
-Nd: catch on man -k altq/queue
-Xr
-BNF: should leave enough place/logic for more then cbq
henning@ "commit" ok
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/pf.conf.5 | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 8eec274a68e..652dd7a1046 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.105 2002/11/13 18:24:53 dhartmei Exp $ +.\" $OpenBSD: pf.conf.5,v 1.106 2002/11/19 10:29:10 pb Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier .\" All rights reserved. @@ -27,12 +27,12 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 2, 2002 +.Dd Nov 19, 2002 .Dt PF.CONF 5 .Os .Sh NAME .Nm pf.conf -.Nd filtering and translation (NAT) rules file for the +.Nd filtering, translation (NAT) and queue (ALTQ) rules file for the packet filter .Sh DESCRIPTION The @@ -1071,7 +1071,7 @@ Syntax for in BNF: .Bd -literal line = ( option | pf_rule | nat_rule | binat_rule | rdr_rule | - antispoof_rule ) + antispoof_rule | altq_rule | queue_rule ) option = set ( [ "timeout" ( timeout | "{" timeout-list "}" ) ] | [ "optimization" [ "default" | "normal" | @@ -1109,6 +1109,13 @@ antispoof_rule = "antispoof" [ "log" ] [ "quick" ] "for" ( interface-name | "{" interface-list "}" ) [ af ] . +altq_rule = "altq" "on" interface-name "scheduler" "cbq" "bandwidth" + number [ "kb" | "Mb" | "Gb" ] [ "queue" "{" queue-list "}" ] . + +queue_rule = "queue" string "bandwidth" number [ "kb" | "Mb" | "Gb" | "%" ] + [ "priority" number ] [ cbq-def ] + [ "queue" ( string | "{" queue-list "}" ) ] . + action = "pass" | "block" [ return ] | "scrub" . return = "drop" | "return" | @@ -1184,6 +1191,11 @@ seconds = number . limit-list = limit [ [ "," ] limit-list ] . limit = ( "states" | "frags" ) number . + +queue-list = string [ [ "," ] string ] . +cbq-def = "cbq" [ "(" cbq-type [ [ "," ] cbq-type ] ")" ] . +cbq-type = ( "default" | "control" | "borrow" | "red" | "ecn" | "rio" ) . + .Ed .Sh FILES .Bl -tag -width "/etc/pf.conf" -compact @@ -1199,7 +1211,8 @@ limit = ( "states" | "frags" ) number . .Xr services 5 , .Xr ftp-proxy 8 , .Xr pfctl 8 , -.Xr pflogd 8 +.Xr pflogd 8 , +.Xr altq 9 .Sh HISTORY The .Nm |