regen after pfctl output change

1 files changed, 60 insertions, 0 deletions

diff --git a/regress/sbin/pfctl/pf47.loaded b/regress/sbin/pfctl/pf47.loaded
index fe941b76a0b..0ae68e540f9 100644
--- a/regress/sbin/pfctl/pf47.loaded
+++ b/regress/sbin/pfctl/pf47.loaded
@@ -1,240 +1,300 @@
 @0 pass in on lo0 all 
 [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @1 pass in all label "any" 
 [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @2 pass in on lo0 all label "lo0" 
 [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @3 pass in on lo0 all label "lo0lo0" 
 [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @4 pass in on lo0 all label "any" 
 [ Skip steps: i=end d=end p=35 sa=6 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @5 pass in on lo0 inet all label "any" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @6 pass in on lo0 inet from 127.0.0.1 to any label "127.0.0.1" 
 [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @7 pass in on lo0 inet from 127.0.0.1 to any label "127.0.0.1127.0.0.1" 
 [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @8 pass in on lo0 inet from 127.0.0.1 to any label ":127.0.0.1:127.0.0.1:" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @9 pass in on lo0 inet from 127.0.0.0/8 to any label "127.0.0.0/8" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @10 pass in on lo0 inet from 127.0.0.0/16 to any label "127.0.0.0/16127.0.0.0/16" 
 [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @11 pass in on lo0 inet from 127.0.0.0/31 to any label ":127.0.0.0/31:127.0.0.0/31:" 
 [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @12 pass in on lo0 inet6 from fe80::1 to any label "fe80::1" 
 [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @13 pass in on lo0 inet6 from fe80::1 to any label "fe80::1fe80::1" 
 [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @14 pass in on lo0 inet6 from fe80::1 to any label ":fe80::1:fe80::1:" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @15 pass in on lo0 inet6 from ::/8 to any label "::/8" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @16 pass in on lo0 inet6 from fe00::/8 to any label "fe00::/8" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @17 pass in on lo0 inet6 from ::/64 to any label "::/64::/64" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @18 pass in on lo0 inet6 from fe80::/64 to any label "fe80::/64fe80::/64" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @19 pass in on lo0 inet6 from ::/127 to any label ":::/127:::/127:" 
 [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @20 pass in on lo0 inet6 from fe80::/127 to any label ":fe80::/127:fe80::/127:" 
 [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @21 pass in on lo0 all label "!any!" 
 [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @22 pass in on lo0 inet from any to (lo0) label "(lo0)" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @23 pass in on lo0 inet from any to (lo0) label "(lo0)(lo0)" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @24 pass in on lo0 inet from any to (lo0) label " (lo0) (lo0) " 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @25 pass in on lo0 inet from any to ! 127.0.0.0/8 label "! 127.0.0.0/8" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @26 pass in on lo0 inet from any to ! 127.0.0.0/16 label "! 127.0.0.0/16! 127.0.0.0/16" 
 [ Skip steps: i=end d=end f=28 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @27 pass in on lo0 inet from any to ! 127.0.0.0/31 label " ! 127.0.0.0/31 ! 127.0.0.0/31 " 
 [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @28 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @29 pass in on lo0 inet6 from any to ! (lo0) label "! (lo0)! (lo0)" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @30 pass in on lo0 inet6 from any to ! (lo0) label " ! (lo0) ! (lo0) " 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @31 pass in on lo0 inet6 from any to ! ::/8 label "! ::/8" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @32 pass in on lo0 inet6 from any to ! ::/64 label "! ::/64! ::/64" 
 [ Skip steps: i=end d=end f=34 p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @33 pass in on lo0 inet6 from any to ! ::/127 label " ! ::/127 ! ::/127 " 
 [ Skip steps: i=end d=end p=35 sa=59 sp=35 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @34 pass in on lo0 all label "xx" 
 [ Skip steps: i=end d=end f=59 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @35 pass in on lo0 proto tcp from any port = 28 to any label "28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @36 pass in on lo0 proto tcp from any port 28 >< 29 to any label "28><29" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @37 pass in on lo0 proto tcp from any port 28 <> 29 to any label "28<>29" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @38 pass in on lo0 proto tcp from any port != 28 to any label "!=28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @39 pass in on lo0 proto tcp from any port < 28 to any label "<28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @40 pass in on lo0 proto tcp from any port <= 28 to any label "<=28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @41 pass in on lo0 proto tcp from any port > 28 to any label ">28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @42 pass in on lo0 proto tcp from any port >= 28 to any label ">=28" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @43 pass in on lo0 proto tcp from any port = 28 to any label "2828" 
 [ Skip steps: i=end d=end f=59 p=45 sa=59 sp=45 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @44 pass in on lo0 proto tcp from any port = 28 to any label "$28$28$" 
 [ Skip steps: i=end d=end f=59 sa=59 da=59 dp=46 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @45 pass in on lo0 all 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @46 pass in on lo0 proto udp from any to any port = 29 label "29" 
 [ Skip steps: i=end d=end f=59 p=49 sa=59 sp=59 da=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @47 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29" 
 [ Skip steps: i=end d=end f=59 p=49 sa=59 sp=59 da=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @48 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @49 pass in on lo0 all label "ip" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @50 pass in on lo0 proto esp all label "esp" 
 [ Skip steps: i=end d=end f=59 p=53 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @51 pass in on lo0 proto esp all label "espesp" 
 [ Skip steps: i=end d=end f=59 p=53 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @52 pass in on lo0 proto esp all label "-esp-esp-" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @53 pass in on lo0 proto 166 all label "166" 
 [ Skip steps: i=end d=end f=59 p=56 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @54 pass in on lo0 proto 166 all label "166166" 
 [ Skip steps: i=end d=end f=59 p=56 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @55 pass in on lo0 proto 166 all label "_166_166_" 
 [ Skip steps: i=end d=end f=59 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @56 pass in on lo0 all label "56" 
 [ Skip steps: i=end d=end f=59 p=59 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @57 pass in on lo0 all label "5757" 
 [ Skip steps: i=end d=end f=59 p=59 sa=59 sp=59 da=59 dp=59 ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @58 pass in on lo0 all label "%58%58%" 
 [ Skip steps: i=end d=end ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
 @59 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44" 
 [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+[ Queue: qname= qid=0 pqname= pqid=0 ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]