test service curves

3 files changed, 19 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 69e8e0b4f6f..7f378594ebb 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.124 2003/04/13 16:57:31 henning Exp $
+# $OpenBSD: Makefile,v 1.125 2003/04/13 23:37:39 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 11
+PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12
 # 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/pfaltq12.in b/regress/sbin/pfctl/pfaltq12.in
new file mode 100644
index 00000000000..4aeb4201f0e
--- /dev/null
+++ b/regress/sbin/pfctl/pfaltq12.in
@@ -0,0 +1,9 @@
+# linkshare & upperlimit service curves
+
+altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
+queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%))
+queue zwei bandwidth 40% hfsc(linkshare 35% upperlimit 5Mb)
+queue drei bandwidth 50% hfsc(linkshare(60% 20 40%) \
+	upperlimit(65% 10 45%))
+
+
diff --git a/regress/sbin/pfctl/pfaltq12.ok b/regress/sbin/pfctl/pfaltq12.ok
new file mode 100644
index 00000000000..3f03e42d1e6
--- /dev/null
+++ b/regress/sbin/pfctl/pfaltq12.ok
@@ -0,0 +1,8 @@
+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(2Mb 20ms 500Kb) ) 
+[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+queue  zwei bandwidth 4Mb hfsc( linkshare 3.50Mb upperlimit 5Mb ) 
+[ qid=3 ifname=lo0 ifbandwidth=10Mb ]
+queue  drei bandwidth 5Mb hfsc( linkshare(6Mb 20ms 4Mb) upperlimit(6.50Mb 10ms 4.50Mb) ) 
+[ qid=4 ifname=lo0 ifbandwidth=10Mb ]