diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2013-01-16 01:49:21 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2013-01-16 01:49:21 +0000 |
| commit | ad612b236fa920d5173781da905359e408b406a0 (patch) | |
| tree | 24ef9257b277dec69169100655dc013f63c0e0bb /share | |
| parent | 2c930626ad8206aed974aa937c131fe2c1c92143 (diff) | |
for consistency with prio etc, the queue assignment really belongs
into the set block. so make pfctl accept, print and the manpage document
. match set queue foo
instead of
. match queue foo
but keep accepting the old way without the explicit set.
ok bob, man jmc
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/pf.conf.5 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index d88dcab1b02..345762a8384 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.523 2012/10/18 15:18:56 reyk Exp $ +.\" $OpenBSD: pf.conf.5,v 1.524 2013/01/16 01:49:20 henning Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: October 18 2012 $ +.Dd $Mdocdate: January 16 2013 $ .Dt PF.CONF 5 .Os .Sh NAME @@ -622,7 +622,7 @@ For example, the following rule will drop 20% of incoming ICMP packets: .Pp .Dl block in proto icmp probability 20% .Pp -.It Xo Ar queue Aq Ar queue +.It Xo Ar set queue Aq Ar queue .No \*(Ba ( Aq Ar queue , .Aq Ar queue ) .Xc @@ -636,8 +636,8 @@ for setup details. .Pp For example: .Bd -literal -offset indent -pass in proto tcp to port 25 queue mail -pass in proto tcp to port 22 queue(ssh_bulk, ssh_prio) +pass in proto tcp to port 25 set queue mail +pass in proto tcp to port 22 set queue(ssh_bulk, ssh_prio) .Ed .Pp .It Ar received-on Aq Ar interface @@ -1697,15 +1697,15 @@ queue ssh bandwidth 20% cbq(borrow) { ssh_interactive, ssh_bulk } queue ssh_interactive bandwidth 50% priority 7 cbq(borrow) queue ssh_bulk bandwidth 50% priority 0 cbq(borrow) -block return out on dc0 inet all queue std +block return out on dc0 inet all set queue std pass out on dc0 inet proto tcp from $developerhosts to any port 80 \e - queue developers + set queue developers pass out on dc0 inet proto tcp from $employeehosts to any port 80 \e - queue employees + set queue employees pass out on dc0 inet proto tcp from any to any port 22 \e - queue(ssh_bulk, ssh_interactive) + set queue(ssh_bulk, ssh_interactive) pass out on dc0 inet proto tcp from any to any port 25 \e - queue mail + set queue mail .Ed .Sh TABLES Tables are named structures which can hold a collection of addresses and @@ -2797,7 +2797,7 @@ filteropt = user | group | flags | icmp-type | icmp6-type | "divert-to" host "port" port | "label" string | "tag" string | [ ! ] "tagged" string | "set prio" ( number | "(" number [ [ "," ] number ] ")" ) | - "queue" ( string | "(" string [ [ "," ] string ] ")" ) | + "set queue" ( string | "(" string [ [ "," ] string ] ")" ) | "rtable" number | "probability" number"%" | "af-to" af "from" ( redirhost | "{" redirhost-list "}" ) [ "to" ( redirhost | "{" redirhost-list "}" ) ] | |