diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2003-04-03 14:20:10 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-04-03 14:20:10 +0000 |
commit | 5c768ec5c3f404ee20b4f0aec19b339d0a1ee96b (patch) | |
tree | 152be23f4fe3a5a80c36b7ddfe46917d8ecfc4a7 /regress | |
parent | 42a1c5b3e569b9a1279e515df784416243eaaa05 (diff) |
differently named queues on different interfaces must get different queue
IDs. this conflicts with the way priq works now, where
queueID = priority + 1
thus, this test fails atm.
Diffstat (limited to 'regress')
-rw-r--r-- | regress/sbin/pfctl/Makefile | 4 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfaltq7.in | 12 | ||||
-rw-r--r-- | regress/sbin/pfctl/pfaltq7.ok | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 3ce1e80c10c..9ea6c2b47d5 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.119 2003/03/27 16:13:14 henning Exp $ +# $OpenBSD: Makefile,v 1.120 2003/04/03 14:20:09 henning Exp $ # TARGETS # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok @@ -19,7 +19,7 @@ PFSIMPLE=1 2 PFSETUP=1 2 3 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 23 24 25 26 27 28 29 PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 49 54 56 60 -PFALTQ=1 2 3 4 5 6 +PFALTQ=1 2 3 4 5 6 7 # disabled; no altq in anchors # PFLOAD+=33 35 37 42 43 45 51 58 59 # disabled; no table def in anchors diff --git a/regress/sbin/pfctl/pfaltq7.in b/regress/sbin/pfctl/pfaltq7.in new file mode 100644 index 00000000000..9678a7e1653 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq7.in @@ -0,0 +1,12 @@ +# more complicated case to provoke queue id assignment errors: +# -differently named queues have same priority, must get different qids +# goes back to the historical queue ID assignment algorithm with priq +# was: qid = priority + 1 + +altq on lo0 tbrsize 1824 bandwidth 10Mb priq queue eins +queue eins priority 2 priq(default) + +altq on tun0 tbrsize 1824 bandwidth 33600b priq queue zwei +queue zwei priority 2 priq(default) + + diff --git a/regress/sbin/pfctl/pfaltq7.ok b/regress/sbin/pfctl/pfaltq7.ok new file mode 100644 index 00000000000..87c796ef74f --- /dev/null +++ b/regress/sbin/pfctl/pfaltq7.ok @@ -0,0 +1,4 @@ +queue eins priority 2 priq( default ) +[ qid=1 ifname=lo0 ifbandwidth=10Mb ] +queue zwei priority 2 priq( default ) +[ qid=2 ifname=tun0 ifbandwidth=33.60Kb ] |