fixup pfctl regress fallout from the "set tos" and "set queue" changes

6 files changed, 33 insertions, 33 deletions

diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in
index 8900969633f..13d20b6b70d 100644
--- a/regress/sbin/pfctl/pf15.in
+++ b/regress/sbin/pfctl/pf15.in
@@ -4,8 +4,8 @@ match scrub(no-df)
 match scrub(min-ttl 25)
 match scrub(max-mss 224)
 match scrub(no-df max-mss 224)
-match scrub(set-tos lowdelay)
-match out proto esp scrub(set-tos throughput)
-match out proto ah scrub(set-tos reliability)
-match out proto icmp scrub(set-tos 0x12)
-match out all tagged THROUGHPUT scrub (set-tos throughput)
+match set tos lowdelay
+match out proto esp set tos throughput
+match out proto ah set tos reliability
+match out proto icmp set tos 0x12
+match out all tagged THROUGHPUT set tos throughput
diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok
index e98a3a1c210..151300b271d 100644
--- a/regress/sbin/pfctl/pf33.ok
+++ b/regress/sbin/pfctl/pf33.ok
@@ -7,9 +7,9 @@ queue http_cust1 bandwidth 500Kb
 queue mail bandwidth 10% 
 queue ssh bandwidth 200Kb priority 7 cbq( borrow ) 
 queue rsets bandwidth 150Kb priority 0 cbq( red ) 
-block return in on lo0 inet all queue rsets
-pass in on lo0 inet proto tcp from any to any port = 80 flags S/SA queue http
-pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA queue ssh
-pass in on lo0 inet proto tcp from any to any port = 22 flags S/SA queue ssh
-pass out on lo0 inet proto tcp from any to any port = 25 flags S/SA queue mail
+block return in on lo0 inet all set ( queue rsets )
+pass in on lo0 inet proto tcp from any to any port = 80 flags S/SA set ( queue http )
+pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA set ( queue ssh )
+pass in on lo0 inet proto tcp from any to any port = 22 flags S/SA set ( queue ssh )
+pass out on lo0 inet proto tcp from any to any port = 25 flags S/SA set ( queue mail )
 pass out on lo0 inet all flags S/SA
diff --git a/regress/sbin/pfctl/pf35.ok b/regress/sbin/pfctl/pf35.ok
index ee56bc16bdc..38a84af5f65 100644
--- a/regress/sbin/pfctl/pf35.ok
+++ b/regress/sbin/pfctl/pf35.ok
@@ -10,9 +10,9 @@ queue mail bandwidth 10% priority 0 cbq( red ecn borrow )
 queue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk }
 queue ssh_interactive bandwidth 30% priority 7 
 queue ssh_bulk bandwidth 70% priority 0 qlimit 60 
-block return out on lo0 inet all queue std
-pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = 80 flags S/SA queue developers
-pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = 80 flags S/SA queue employees
-pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA tos 0x10 queue ssh_interactive
-pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA tos 0x08 queue ssh_bulk
-pass out on lo0 inet proto tcp from any to any port = 25 flags S/SA queue mail
+block return out on lo0 inet all set ( queue std )
+pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = 80 flags S/SA set ( queue developers )
+pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = 80 flags S/SA set ( queue employees )
+pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA tos 0x10 set ( queue ssh_interactive )
+pass out on lo0 inet proto tcp from any to any port = 22 flags S/SA tos 0x08 set ( queue ssh_bulk )
+pass out on lo0 inet proto tcp from any to any port = 25 flags S/SA set ( queue mail )
diff --git a/regress/sbin/pfctl/pf39.ok b/regress/sbin/pfctl/pf39.ok
index 6b0943a820f..3ec0067cdfb 100644
--- a/regress/sbin/pfctl/pf39.ok
+++ b/regress/sbin/pfctl/pf39.ok
@@ -13,12 +13,12 @@ o_allowopts = "allow-opts "
 o_label = "label blah"
 o_qname = "queue blah"
 pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah"
-pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 label "blah" queue blah
+pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
+pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( queue blah ) label "blah"
 pass in log quick on lo0 inet proto tcp all flags S/SA
-pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah
+pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( queue blah ) label "blah"
 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08
 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts
diff --git a/regress/sbin/pfctl/pf39.optimized b/regress/sbin/pfctl/pf39.optimized
index b0b2b5382ce..a83bf064b75 100644
--- a/regress/sbin/pfctl/pf39.optimized
+++ b/regress/sbin/pfctl/pf39.optimized
@@ -2,23 +2,23 @@
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah
+@1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah
+@2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah
+@3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah
+@4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 set ( queue blah ) allow-opts label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 label "blah" queue blah
+@5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 set ( queue blah ) label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
@@ -26,7 +26,7 @@
   [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah
+@7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 set ( queue blah ) label "blah"
   [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf43.ok b/regress/sbin/pfctl/pf43.ok
index 179a0030be7..14154bac72d 100644
--- a/regress/sbin/pfctl/pf43.ok
+++ b/regress/sbin/pfctl/pf43.ok
@@ -1,8 +1,8 @@
 altq on lo0 cbq bandwidth 100Mb tbrsize 3648 queue { bulk urgent }
 queue bulk bandwidth 70% cbq( default ) 
 queue urgent bandwidth 30% priority 7 
-pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue(bulk, urgent)
-pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue bulk
-pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue(bulk, urgent)
-pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue bulk
-pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA queue(bulk, urgent)
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue(bulk, urgent) )
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue bulk )
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue(bulk, urgent) )
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue bulk )
+pass in on lo0 inet proto tcp from any to 127.0.0.1 port = 22 flags S/SA set ( queue(bulk, urgent) )