sync optimized versions as well

ok henning@

2 files changed, 16 insertions, 32 deletions

diff --git a/regress/sbin/pfctl/pf17.optimized b/regress/sbin/pfctl/pf17.optimized
index 1279985eae8..f1f4a2eded8 100644
--- a/regress/sbin/pfctl/pf17.optimized
+++ b/regress/sbin/pfctl/pf17.optimized
@@ -118,51 +118,51 @@
   [ Skip steps: i=42 d=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@30 binat on lo0 inet6 from ::1 to (lo:2) -> ::1
+@30 binat on lo0 inet6 from ::1 to (lo0:2) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@31 binat on lo0 inet6 from ::1 to (lo:0:1) -> ::1
+@31 binat on lo0 inet6 from ::1 to (lo0:0:1) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@32 binat on lo0 inet6 from ::1 to (lo:peer:*) -> ::1
+@32 binat on lo0 inet6 from ::1 to (lo0:peer:*) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@33 binat on lo0 inet6 from ::1 to (lo:peer:0:*) -> ::1
+@33 binat on lo0 inet6 from ::1 to (lo0:peer:0:*) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@34 binat on lo0 inet6 from ::1 to (lo:broadcast:*) -> ::1
+@34 binat on lo0 inet6 from ::1 to (lo0:broadcast:*) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@35 binat on lo0 inet6 from ::1 to (lo:broadcast:0:*) -> ::1
+@35 binat on lo0 inet6 from ::1 to (lo0:broadcast:0:*) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@36 binat on lo0 inet6 from ::1 to (lo:network:1) -> ::1
+@36 binat on lo0 inet6 from ::1 to (lo0:network:1) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@37 binat on lo0 inet6 from ::1 to (lo:network:0:1) -> ::1
+@37 binat on lo0 inet6 from ::1 to (lo0:network:0:1) -> ::1
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@38 binat on lo0 inet6 from ::1 to (lo:2)/100 -> ::2
+@38 binat on lo0 inet6 from ::1 to (lo0:2)/100 -> ::2
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@39 binat on lo0 inet6 from ::1 to (lo:0:1)/100 -> ::2
+@39 binat on lo0 inet6 from ::1 to (lo0:0:1)/100 -> ::2
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@40 binat on lo0 inet6 from ::1 to (lo:peer:*)/100 -> ::2
+@40 binat on lo0 inet6 from ::1 to (lo0:peer:*)/100 -> ::2
   [ Skip steps: i=42 d=end f=end p=end sa=42 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@41 binat on lo0 inet6 from ::1 to (lo:peer:0:*)/100 -> ::2
+@41 binat on lo0 inet6 from ::1 to (lo0:peer:0:*)/100 -> ::2
   [ Skip steps: d=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf25.optimized b/regress/sbin/pfctl/pf25.optimized
index 488d10164e1..37180adfd2d 100644
--- a/regress/sbin/pfctl/pf25.optimized
+++ b/regress/sbin/pfctl/pf25.optimized
@@ -1,36 +1,20 @@
 @0 block drop in on ! lo0 inet from 127.0.0.0/8 to any
-  [ Skip steps: i=5 d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in on ! lo0 inet6 from ::1 to any
-  [ Skip steps: i=5 d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any
-  [ Skip steps: i=5 d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=end d=end p=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in on ! lo0 from (lo0:network:2) to any
-  [ Skip steps: i=5 d=end p=end sa=5 sp=end da=end dp=end ]
+  [ Skip steps: i=end d=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     ]
 @4 block drop in log quick on ! lo0 inet from (lo0:network:1) to any
-  [ Skip steps: d=end p=end sp=end da=end dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@5 block drop in on ! lo from (lo:network:2) to any
-  [ Skip steps: d=end f=7 p=end sp=end da=end dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@6 block drop in from (lo:3) to any
-  [ Skip steps: d=end p=end sp=end da=end dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@7 block drop in log quick on ! lo inet from (lo:network:1) to any
-  [ Skip steps: d=end f=end p=end sp=end da=end dp=end ]
-  [ queue: qname= qid=0 pqname= pqid=0 ]
-  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@8 block drop in log quick inet from (lo:1) to any
   [ 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     ]