more hfsc test; especially for the feedback test

3 files changed, 21 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 2043f62617c..dc54f8ca47a 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.127 2003/04/13 23:40:52 henning Exp $
+# $OpenBSD: Makefile,v 1.128 2003/04/13 23:49:12 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
+PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62
 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
 # disabled; no altq in anchors
-# PFLOAD+=33 35 37 42 43 45 51 58 59
+# PFLOAD+=33 35 37 42 43 45 51 58 59 62
 # disabled; no table def in anchors
 # PFLOAD+=48
 # only testing parser, load test would be useless
diff --git a/regress/sbin/pfctl/pf62.in b/regress/sbin/pfctl/pf62.in
new file mode 100644
index 00000000000..64447b37552
--- /dev/null
+++ b/regress/sbin/pfctl/pf62.in
@@ -0,0 +1,12 @@
+# more complicated case to provoke queue id assignment errors:
+# -two same named queues must have same qid on all interfaces
+# -two differently named queues must not share a qid, even on different ifs
+
+altq on lo0 tbrsize 1824 bandwidth 10Mb hfsc queue { eins zwei drei }
+queue eins bandwidth 10% hfsc(default)
+queue zwei bandwidth 60% { sub2 sub3 }
+queue  sub2 bandwidth 20%
+queue  sub3 bandwidth 20%
+queue drei bandwidth 10%
+
+
diff --git a/regress/sbin/pfctl/pf62.ok b/regress/sbin/pfctl/pf62.ok
new file mode 100644
index 00000000000..626050dac5c
--- /dev/null
+++ b/regress/sbin/pfctl/pf62.ok
@@ -0,0 +1,6 @@
+altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins zwei drei }
+queue eins bandwidth 10% hfsc( default linkshare 1Mb ) 
+queue zwei bandwidth 60% hfsc( linkshare 6Mb ) { sub2 sub3 }
+queue sub2 bandwidth 20% hfsc( linkshare 1.20Mb ) 
+queue sub3 bandwidth 20% hfsc( linkshare 1.20Mb ) 
+queue drei bandwidth 10% hfsc( linkshare 1Mb )