diff options
| -rw-r--r-- | regress/sbin/pfctl/Makefile | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq11.in | 15 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq11.ok | 28 |
3 files changed, 45 insertions, 2 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 43f82dc46f4..69e8e0b4f6f 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.123 2003/04/12 20:11:30 henning Exp $ +# $OpenBSD: Makefile,v 1.124 2003/04/13 16:57:31 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 61 -PFALTQ=1 2 3 4 5 6 7 8 9 10 +PFALTQ=1 2 3 4 5 6 7 8 9 10 11 # 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/pfaltq11.in b/regress/sbin/pfctl/pfaltq11.in new file mode 100644 index 00000000000..4ef6231a8d7 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq11.in @@ -0,0 +1,15 @@ +# more complicated case to provoke queue id assignment errors: +# -two same named queues must have same qid on all interfaces +# -two differently named queues must not share a qid, even on different ifs + +altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei } +altq on tun0 tbrsize 1824 bandwidth 33600b hfsc queue { vier zwei fuenf } +queue eins bandwidth 10% hfsc(default) +queue zwei bandwidth 80% { sub2 sub3 } +queue sub2 bandwidth 50% +queue sub3 bandwidth 50% +queue drei bandwidth 10% subseven +queue vier bandwidth 10% hfsc(default) +queue fuenf bandwidth 50% subseven +queue subseven bandwidth 90% + diff --git a/regress/sbin/pfctl/pfaltq11.ok b/regress/sbin/pfctl/pfaltq11.ok new file mode 100644 index 00000000000..60b40e2105f --- /dev/null +++ b/regress/sbin/pfctl/pfaltq11.ok @@ -0,0 +1,28 @@ +queue root_lo0 bandwidth 10Mb priority 0 hfsc( realtime 10Mb linkshare 10Mb ) {eins, zwei, drei} +[ qid=1 ifname=lo0 ifbandwidth=10Mb ] +queue eins bandwidth 1Mb hfsc( default linkshare 1Mb ) +[ qid=2 ifname=lo0 ifbandwidth=10Mb ] +queue zwei bandwidth 8Mb hfsc( linkshare 8Mb ) {sub2, sub3} +[ qid=3 ifname=lo0 ifbandwidth=10Mb ] +queue sub2 bandwidth 4Mb hfsc( linkshare 4Mb ) +[ qid=4 ifname=lo0 ifbandwidth=10Mb ] +queue sub3 bandwidth 4Mb hfsc( linkshare 4Mb ) +[ qid=5 ifname=lo0 ifbandwidth=10Mb ] +queue drei bandwidth 1Mb hfsc( linkshare 1Mb ) {subseven} +[ qid=6 ifname=lo0 ifbandwidth=10Mb ] +queue subseven bandwidth 900Kb hfsc( linkshare 900Kb ) +[ qid=9 ifname=lo0 ifbandwidth=10Mb ] +queue root_tun0 bandwidth 33.60Kb priority 0 hfsc( realtime 33.60Kb linkshare 33.60Kb ) {zwei, vier, fuenf} +[ qid=1 ifname=tun0 ifbandwidth=33.60Kb ] +queue zwei bandwidth 26.88Kb hfsc( linkshare 26.88Kb ) {sub2, sub3} +[ qid=3 ifname=tun0 ifbandwidth=33.60Kb ] +queue sub2 bandwidth 13.40Kb hfsc( linkshare 13.40Kb ) +[ qid=4 ifname=tun0 ifbandwidth=33.60Kb ] +queue sub3 bandwidth 13.40Kb hfsc( linkshare 13.40Kb ) +[ qid=5 ifname=tun0 ifbandwidth=33.60Kb ] +queue vier bandwidth 3.36Kb hfsc( default linkshare 3.36Kb ) +[ qid=7 ifname=tun0 ifbandwidth=33.60Kb ] +queue fuenf bandwidth 16.80Kb hfsc( linkshare 16.80Kb ) {subseven} +[ qid=8 ifname=tun0 ifbandwidth=33.60Kb ] +queue subseven bandwidth 15.12Kb hfsc( linkshare 15.12Kb ) +[ qid=9 ifname=tun0 ifbandwidth=33.60Kb ] |