test invalid priorities fro CBQ and PRIQ

5 files changed, 27 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 84e6b6af683..c28099a4674 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.161 2003/07/19 15:08:30 cedric Exp $
+# $OpenBSD: Makefile,v 1.162 2003/08/20 13:04:50 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -15,7 +15,7 @@ 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 63 64 65 66 67 68 69 70 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82
 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 37 38 39 40 41 42 43
+PFFAIL+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
 PFSIMPLE=1 2
 PFSETUP=1 2 3 4
 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
diff --git a/regress/sbin/pfctl/pfail44.in b/regress/sbin/pfctl/pfail44.in
new file mode 100644
index 00000000000..5a31098e0d9
--- /dev/null
+++ b/regress/sbin/pfctl/pfail44.in
@@ -0,0 +1,8 @@
+# invalid CBQ priority
+
+ext_if = lo0
+
+altq on $ext_if bandwidth 512Kb tbrsize 33224 cbq queue { q_ext_std }
+queue q_ext_std priority 9 cbq(default)
+
+pass in all
diff --git a/regress/sbin/pfctl/pfail44.ok b/regress/sbin/pfctl/pfail44.ok
new file mode 100644
index 00000000000..d1e4ef35eae
--- /dev/null
+++ b/regress/sbin/pfctl/pfail44.ok
@@ -0,0 +1,6 @@
+pfctl: priority out of range: max 7
+stdin:6: errors in queue definition
+ext_if = "lo0"
+altq on lo0 cbq bandwidth 512Kb tbrsize 33224 queue { q_ext_std }
+queue root_lo0 priority 0 cbq( wrr root ) 
+pass in all
diff --git a/regress/sbin/pfctl/pfail45.in b/regress/sbin/pfctl/pfail45.in
new file mode 100644
index 00000000000..54857dc9436
--- /dev/null
+++ b/regress/sbin/pfctl/pfail45.in
@@ -0,0 +1,6 @@
+# invalid PRIQ priority
+
+ext_if = lo0
+
+altq on $ext_if bandwidth 512Kb tbrsize 33224 priq queue { q_ext_std }
+queue q_ext_std priority 16 priq(default)
diff --git a/regress/sbin/pfctl/pfail45.ok b/regress/sbin/pfctl/pfail45.ok
new file mode 100644
index 00000000000..fadee8fde76
--- /dev/null
+++ b/regress/sbin/pfctl/pfail45.ok
@@ -0,0 +1,5 @@
+pfctl: priority out of range: max 15
+stdin:6: errors in queue definition
+ext_if = "lo0"
+altq on lo0 priq bandwidth 512Kb tbrsize 33224 queue { q_ext_std }
+queue  priority 0