test rules get the qid and pqid assigned correctly

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 4e9e43a..773dc08 100644 (file)
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.115 2003/03/11 15:05:53 henning Exp $
+# $OpenBSD: Makefile,v 1.116 2003/03/11 15:07:19 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
-PFALTQ=1 2 3 4
+PFALTQ=1 2 3 4 5
 # 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/pfaltq5.in b/regress/sbin/pfctl/pfaltq5.in
new file mode 100644 (file)
index 0000000..553d5ae
--- /dev/null
+++ b/regress/sbin/pfctl/pfaltq5.in
@@ -0,0 +1,10 @@
+# verify the queue IDs on the rules are set correctly
+
+altq on lo0 tbrsize 1824 priq bandwidth 10Mb queue { praise wim hi }
+queue praise priq(default)
+queue wim priority 15
+queue hi priority 7
+pass in on lo0 proto tcp to port 22 keep state queue(hi wim)
+pass in proto tcp to port 22 keep state queue(hi wim)
+pass in proto tcp to port 22 keep state queue wim
+pass in proto tcp to port 25 keep state queue praise

diff --git a/regress/sbin/pfctl/pfaltq5.ok b/regress/sbin/pfctl/pfaltq5.ok
new file mode 100644 (file)
index 0000000..58100d3
--- /dev/null
+++ b/regress/sbin/pfctl/pfaltq5.ok
@@ -0,0 +1,18 @@
+queue praise priq( default ) 
+[ qid=2 ifname=lo0 ifbandwidth=10Mb ]
+queue wim priority 15 
+[ qid=16 ifname=lo0 ifbandwidth=10Mb ]
+queue hi priority 7 
+[ qid=8 ifname=lo0 ifbandwidth=10Mb ]
+@0 pass in on lo0 proto tcp from any to any port = ssh keep state queue(hi, wim) 
+[ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=3 ]
+[ queue: qname=hi qid=8 pqname=wim pqid=16 ]
+@1 pass in proto tcp from any to any port = ssh keep state queue(hi, wim) 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=3 ]
+[ queue: qname=hi qid=8 pqname=wim pqid=16 ]
+@2 pass in proto tcp from any to any port = ssh keep state queue wim 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ]
+[ queue: qname=wim qid=16 pqname= pqid=16 ]
+@3 pass in proto tcp from any to any port = smtp keep state queue praise 
+[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+[ queue: qname=praise qid=2 pqname= pqid=2 ]