summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2013-11-27 15:16:29 +0000
committerjmc <jmc@openbsd.org>2013-11-27 15:16:29 +0000
commit1fcc82a797d437a46dd9b64439bea28465886855 (patch)
treeeb3a49bf1e55ee6283c466fc0758044c10cdb080
parentremove erroneous char cast to switch expression processing getopt(3); (diff)
downloadwireguard-openbsd-1fcc82a797d437a46dd9b64439bea28465886855.tar.xz
wireguard-openbsd-1fcc82a797d437a46dd9b64439bea28465886855.zip
document better how priorities work, and fix an example;
diff originally from timo myyra, but tweaked according to henning (equal prio packets are fifo, not round-robin); ok henning
-rw-r--r--share/man/man5/pf.conf.59
1 files changed, 6 insertions, 3 deletions
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 66ae597026c..a2a75b91176 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.530 2013/10/12 21:44:57 jmc Exp $
+.\" $OpenBSD: pf.conf.5,v 1.531 2013/11/27 15:16:29 jmc Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
.\" Copyright (c) 2003 - 2013 Henning Brauer <henning@openbsd.org>
@@ -28,7 +28,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: October 12 2013 $
+.Dd $Mdocdate: November 27 2013 $
.Dt PF.CONF 5
.Os
.Sh NAME
@@ -646,6 +646,9 @@ code point in the 802.1Q VLAN header.
If two priorities are given, packets which have a TOS of
.Ar lowdelay
and TCP ACKs with no data payload will be assigned to the second one.
+Packets with a higher priority number are processed first,
+and packets with the same priority are processed
+in the order in which they are received.
.Pp
For example:
.Bd -literal -offset indent
@@ -1551,7 +1554,7 @@ pass out on em0 inet proto tcp from $developerhosts to any port 80 \e
pass out on em0 inet proto tcp from $employeehosts to any port 80 \e
set queue employees
pass out on em0 inet proto tcp from any to any port 22 \e
- set (queue(ssh_bulk, ssh_interactive), prio (6, 3))
+ set (queue(ssh_bulk, ssh_interactive), prio (3, 6))
pass out on em0 inet proto tcp from any to any port 25 \e
set queue mail
.Ed