test HFSC

3 files changed, 31 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index c3d6952ae37..43f82dc46f4 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.122 2003/04/05 21:50:14 henning Exp $
+# $OpenBSD: Makefile,v 1.123 2003/04/12 20:11:30 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
+PFALTQ=1 2 3 4 5 6 7 8 9 10
 # 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/pfaltq10.in b/regress/sbin/pfctl/pfaltq10.in
new file mode 100644
index 00000000000..f1eeed73d98
--- /dev/null
+++ b/regress/sbin/pfctl/pfaltq10.in
@@ -0,0 +1,9 @@
+#queue id assignment with hfsc: two same named queues on different interfaces
+#must have the same qid
+
+altq on { lo0 tun0 } tbrsize 1824 hfsc bandwidth 10Mb queue { one two }
+queue one bandwidth 10% hfsc(default)
+queue two bandwidth 90% { three four}
+queue  three bandwidth 50%
+queue  four bandwidth 40%
+
diff --git a/regress/sbin/pfctl/pfaltq10.ok b/regress/sbin/pfctl/pfaltq10.ok
new file mode 100644
index 00000000000..1eff23d423d
--- /dev/null
+++ b/regress/sbin/pfctl/pfaltq10.ok
@@ -0,0 +1,20 @@
+queue root_lo0 bandwidth 10Mb priority 0 hfsc( realtime 10Mb linkshare 10Mb ) {one, two}
+[ qid=1 ifname=lo0 ifbandwidth=10Mb ]
+queue  one bandwidth 1Mb hfsc( default linkshare 1Mb ) 
+[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+queue  two bandwidth 9Mb hfsc( linkshare 9Mb ) {three, four}
+[ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+queue   three bandwidth 4.50Mb hfsc( linkshare 4.50Mb ) 
+[ qid=4 ifname=lo0 ifbandwidth=10Mb ]
+queue   four bandwidth 3.60Mb hfsc( linkshare 3.60Mb ) 
+[ qid=5 ifname=lo0 ifbandwidth=10Mb ]
+queue root_tun0 bandwidth 10Mb priority 0 hfsc( realtime 10Mb linkshare 10Mb ) {one, two}
+[ qid=1 ifname=tun0 ifbandwidth=10Mb ]
+queue  one bandwidth 1Mb hfsc( default linkshare 1Mb ) 
+[ qid=2 ifname=tun0 ifbandwidth=10Mb ]
+queue  two bandwidth 9Mb hfsc( linkshare 9Mb ) {three, four}
+[ qid=3 ifname=tun0 ifbandwidth=10Mb ]
+queue   three bandwidth 4.50Mb hfsc( linkshare 4.50Mb ) 
+[ qid=4 ifname=tun0 ifbandwidth=10Mb ]
+queue   four bandwidth 3.60Mb hfsc( linkshare 3.60Mb ) 
+[ qid=5 ifname=tun0 ifbandwidth=10Mb ]