From 63f4f8e5fe19fb228a4dc7eab4a231a11b62ed7f Mon Sep 17 00:00:00 2001 From: henning Date: Tue, 11 Mar 2003 12:00:07 +0000 Subject: [PATCH] verify different named queues don't get the same queue id on different interfaces fails right now --- regress/sbin/pfctl/Makefile | 4 ++-- regress/sbin/pfctl/pfaltq4.in | 5 +++++ regress/sbin/pfctl/pfaltq4.ok | 12 ++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 regress/sbin/pfctl/pfaltq4.in create mode 100644 regress/sbin/pfctl/pfaltq4.ok diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 51fdcea6897..c065f81e7f1 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.113 2003/03/11 11:14:59 henning Exp $ +# $OpenBSD: Makefile,v 1.114 2003/03/11 12:00:07 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 3 +PFALTQ=1 2 3 4 # 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/pfaltq4.in b/regress/sbin/pfctl/pfaltq4.in new file mode 100644 index 00000000000..50ddc2303ad --- /dev/null +++ b/regress/sbin/pfctl/pfaltq4.in @@ -0,0 +1,5 @@ +altq on lo0 tbrsize 1824 bandwidth 10Mb cbq queue { bloody germans } +altq on tun0 tbrsize 1824 bandwidth 10Mb cbq queue { bloody toads } +queue bloody cbq(default) bandwidth 50% +queue germans bandwidth 50% +queue toads bandwidth 50% diff --git a/regress/sbin/pfctl/pfaltq4.ok b/regress/sbin/pfctl/pfaltq4.ok new file mode 100644 index 00000000000..11fdce10f69 --- /dev/null +++ b/regress/sbin/pfctl/pfaltq4.ok @@ -0,0 +1,12 @@ +queue root_lo0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, germans} +[ qid=4294967294 ifname=lo0 ifbandwidth=10Mb ] +queue bloody bandwidth 5Mb cbq( default ) +[ qid=4294967293 ifname=lo0 ifbandwidth=10Mb ] +queue germans bandwidth 5Mb +[ qid=1 ifname=lo0 ifbandwidth=10Mb ] +queue root_tun0 bandwidth 10Mb priority 0 cbq( wrr root ) {bloody, toads} +[ qid=4294967294 ifname=tun0 ifbandwidth=10Mb ] +queue bloody bandwidth 5Mb cbq( default ) +[ qid=4294967293 ifname=tun0 ifbandwidth=10Mb ] +queue toads bandwidth 5Mb +[ qid=2 ifname=tun0 ifbandwidth=10Mb ] -- 2.20.1