feedback test the service curve print/parse functions

3 files changed, 16 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index e023947b139..d3c69e86202 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.130 2003/04/14 16:52:25 henning Exp $
+# $OpenBSD: Makefile,v 1.131 2003/04/15 10:55:10 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -12,7 +12,7 @@
 
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
-PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62
+PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFFAIL+=28 29 30 31 32 33 34 35 36
 PFSIMPLE=1 2
@@ -21,7 +21,7 @@ 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 12 13 14
 # disabled; no altq in anchors
-# PFLOAD+=33 35 37 42 43 45 51 58 59 62
+# PFLOAD+=33 35 37 42 43 45 51 58 59 62 63
 # disabled; no table def in anchors
 # PFLOAD+=48
 # only testing parser, load test would be useless
diff --git a/regress/sbin/pfctl/pf63.in b/regress/sbin/pfctl/pf63.in
new file mode 100644
index 00000000000..729721b5a89
--- /dev/null
+++ b/regress/sbin/pfctl/pf63.in
@@ -0,0 +1,9 @@
+# service curve parse/print functions feedback test
+
+altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
+queue eins bandwidth 10% hfsc(default linkshare(20% 20 5%) realtime 500Kb)
+queue zwei bandwidth 40% hfsc(linkshare(35% 10 25%) upperlimit 5Mb)
+queue drei bandwidth 50% hfsc(linkshare(60% 20 4Mb) \
+	upperlimit(65% 10 45%))
+
+
diff --git a/regress/sbin/pfctl/pf63.ok b/regress/sbin/pfctl/pf63.ok
new file mode 100644
index 00000000000..0933efeafea
--- /dev/null
+++ b/regress/sbin/pfctl/pf63.ok
@@ -0,0 +1,4 @@
+altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins zwei drei }
+queue eins bandwidth 10% hfsc( default realtime 500Kb linkshare(2Mb 20 500Kb) ) 
+queue zwei bandwidth 40% hfsc( linkshare(3.50Mb 10 2.50Mb) upperlimit 5Mb ) 
+queue drei bandwidth 50% hfsc( linkshare(6Mb 20 4Mb) upperlimit(6.50Mb 10 4.50Mb) )