diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-11 11:15:00 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-03-11 11:15:00 +0000 |
| commit | 7154a67a588a0d4fd73f4cc6c27031f5ef86d322 (patch) | |
| tree | 13e5df0b9db285c2700efd8acc8feb5ac9958ed9 /regress/sbin/pfctl | |
| parent | cd9d49a2cfd1a7f43233b2bdd5de5f02035caa29 (diff) | |
more complicated cbq queue id assigment verification
Diffstat (limited to 'regress/sbin/pfctl')
| -rw-r--r-- | regress/sbin/pfctl/Makefile | 4 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq3.in | 11 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfaltq3.ok | 28 |
3 files changed, 41 insertions, 2 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 1fcee0f5937..51fdcea6897 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.112 2003/03/11 11:05:11 henning Exp $ +# $OpenBSD: Makefile,v 1.113 2003/03/11 11:14:59 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 -PFALTQ=1 2 +PFALTQ=1 2 3 # 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/pfaltq3.in b/regress/sbin/pfctl/pfaltq3.in new file mode 100644 index 00000000000..70af0ebbb3e --- /dev/null +++ b/regress/sbin/pfctl/pfaltq3.in @@ -0,0 +1,11 @@ +altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { eins zwei drei } +altq on tun0 tbrsize 1824 bandwidth 33600b cbq queue { vier zwei fuenf } +queue eins bandwidth 10% cbq(default) +queue zwei bandwidth 80% { sub2 sub3 } +queue sub2 bandwidth 50% +queue sub3 bandwidth 50% +queue drei bandwidth 10% subseven +queue vier bandwidth 50% cbq(default) +queue fuenf bandwidth 50% subseven +queue subseven bandwidth 90% + diff --git a/regress/sbin/pfctl/pfaltq3.ok b/regress/sbin/pfctl/pfaltq3.ok new file mode 100644 index 00000000000..2bd06741977 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq3.ok @@ -0,0 +1,28 @@ +queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {eins, zwei, drei} +[ qid=4294967294 ifname=lo0 ifbandwidth=10Mb ] +queue eins bandwidth 1Mb cbq( default ) +[ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ] +queue zwei bandwidth 8Mb {sub2, sub3} +[ qid=1 ifname=lo0 ifbandwidth=10Mb ] +queue sub2 bandwidth 4Mb +[ qid=2 ifname=lo0 ifbandwidth=10Mb ] +queue sub3 bandwidth 4Mb +[ qid=3 ifname=lo0 ifbandwidth=10Mb ] +queue drei bandwidth 1Mb {subseven} +[ qid=4 ifname=lo0 ifbandwidth=10Mb ] +queue subseven bandwidth 900Kb +[ qid=5 ifname=lo0 ifbandwidth=10Mb ] +queue root_tun0 bandwidth 33.60Kb priority 0 cbq( wrr root ) {zwei, vier, fuenf} +[ qid=4294967294 ifname=tun0 ifbandwidth=33.60Kb ] +queue zwei bandwidth 26.88Kb {sub2, sub3} +[ qid=1 ifname=tun0 ifbandwidth=33.60Kb ] +queue sub2 bandwidth 13.40Kb +[ qid=2 ifname=tun0 ifbandwidth=33.60Kb ] +queue sub3 bandwidth 13.40Kb +[ qid=3 ifname=tun0 ifbandwidth=33.60Kb ] +queue vier bandwidth 16.80Kb cbq( default ) +[ qid=4294967293 ifname=tun0 ifbandwidth=33.60Kb ] +queue fuenf bandwidth 16.80Kb {subseven} +[ qid=4 ifname=tun0 ifbandwidth=33.60Kb ] +queue subseven bandwidth 15.12Kb +[ qid=5 ifname=tun0 ifbandwidth=33.60Kb ] |