cope with recent canges

6 files changed, 40 insertions, 62 deletions

diff --git a/regress/sbin/pfctl/pf17.in b/regress/sbin/pfctl/pf17.in
index e741d66ea2e..b725c17c7a6 100644
--- a/regress/sbin/pfctl/pf17.in
+++ b/regress/sbin/pfctl/pf17.in
@@ -36,18 +36,18 @@ binat on lo0 from ::1 to (lo1000000:0) -> ::2
 binat on lo0 from ::1 to !(lo1000000:0) -> ::2
 binat on lo0 from (lo0:0) to <sometable> -> ::2
 
-binat on lo0 from ::1 to (lo) -> ::1
-binat on lo0 from ::1 to (lo:0) -> ::1
-binat on lo0 from ::1 to (lo:peer) -> ::1
-binat on lo0 from ::1 to (lo:peer:0) -> ::1
-binat on lo0 from ::1 to (lo:broadcast) -> ::1
-binat on lo0 from ::1 to (lo:broadcast:0) -> ::1
-binat on lo0 from ::1 to (lo:network) -> ::1
-binat on lo0 from ::1 to (lo:network:0) -> ::1
-binat on lo0 from ::1 to (lo)/100 -> ::2
-binat on lo0 from ::1 to (lo:0)/100 -> ::2
-binat on lo0 from ::1 to (lo:peer)/100 -> ::2
-binat on lo0 from ::1 to (lo:peer:0)/100 -> ::2
+binat on lo0 from ::1 to (lo0) -> ::1
+binat on lo0 from ::1 to (lo0:0) -> ::1
+binat on lo0 from ::1 to (lo0:peer) -> ::1
+binat on lo0 from ::1 to (lo0:peer:0) -> ::1
+binat on lo0 from ::1 to (lo0:broadcast) -> ::1
+binat on lo0 from ::1 to (lo0:broadcast:0) -> ::1
+binat on lo0 from ::1 to (lo0:network) -> ::1
+binat on lo0 from ::1 to (lo0:network:0) -> ::1
+binat on lo0 from ::1 to (lo0)/100 -> ::2
+binat on lo0 from ::1 to (lo0:0)/100 -> ::2
+binat on lo0 from ::1 to (lo0:peer)/100 -> ::2
+binat on lo0 from ::1 to (lo0:peer:0)/100 -> ::2
 
 binat on lo from (lo0:0) to ::1 -> ::2
 binat on tun from (lo0:0) to ::1 -> ::2
diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded
index 1279985eae8..f1f4a2eded8 100644
--- a/regress/sbin/pfctl/pf17.loaded
+++ b/regress/sbin/pfctl/pf17.loaded
@@ -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/pf17.ok b/regress/sbin/pfctl/pf17.ok
index c44951645ea..3a200554f1a 100644
--- a/regress/sbin/pfctl/pf17.ok
+++ b/regress/sbin/pfctl/pf17.ok
@@ -28,17 +28,17 @@ binat on lo0 inet6 from ::1 to ! <sometable> -> ::2
 binat on lo0 inet6 from ::1 to (lo1000000:0) -> ::2
 binat on lo0 inet6 from ::1 to ! (lo1000000:0) -> ::2
 binat on lo0 inet6 from (lo0:0) to <sometable> -> ::2
-binat on lo0 inet6 from ::1 to (lo) -> ::1
-binat on lo0 inet6 from ::1 to (lo:0) -> ::1
-binat on lo0 inet6 from ::1 to (lo:peer) -> ::1
-binat on lo0 inet6 from ::1 to (lo:peer:0) -> ::1
-binat on lo0 inet6 from ::1 to (lo:broadcast) -> ::1
-binat on lo0 inet6 from ::1 to (lo:broadcast:0) -> ::1
-binat on lo0 inet6 from ::1 to (lo:network) -> ::1
-binat on lo0 inet6 from ::1 to (lo:network:0) -> ::1
-binat on lo0 inet6 from ::1 to (lo)/100 -> ::2
-binat on lo0 inet6 from ::1 to (lo:0)/100 -> ::2
-binat on lo0 inet6 from ::1 to (lo:peer)/100 -> ::2
-binat on lo0 inet6 from ::1 to (lo:peer:0)/100 -> ::2
+binat on lo0 inet6 from ::1 to (lo0) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:0) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:peer) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:peer:0) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:broadcast) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:broadcast:0) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:network) -> ::1
+binat on lo0 inet6 from ::1 to (lo0:network:0) -> ::1
+binat on lo0 inet6 from ::1 to (lo0)/100 -> ::2
+binat on lo0 inet6 from ::1 to (lo0:0)/100 -> ::2
+binat on lo0 inet6 from ::1 to (lo0:peer)/100 -> ::2
+binat on lo0 inet6 from ::1 to (lo0:peer:0)/100 -> ::2
 binat on lo inet6 from (lo0:0) to ::1 -> ::2
 binat on tun inet6 from (lo0:0) to ::1 -> ::2
diff --git a/regress/sbin/pfctl/pf25.in b/regress/sbin/pfctl/pf25.in
index ac26ef0390a..28d1a335ccf 100644
--- a/regress/sbin/pfctl/pf25.in
+++ b/regress/sbin/pfctl/pf25.in
@@ -2,5 +2,3 @@ antispoof for lo0
 antispoof log quick for lo0 inet
 antispoof for (lo0)
 antispoof log quick for (lo0) inet
-antispoof for (lo)
-antispoof log quick for (lo) inet
diff --git a/regress/sbin/pfctl/pf25.loaded b/regress/sbin/pfctl/pf25.loaded
index 488d10164e1..37180adfd2d 100644
--- a/regress/sbin/pfctl/pf25.loaded
+++ b/regress/sbin/pfctl/pf25.loaded
@@ -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     ]
diff --git a/regress/sbin/pfctl/pf25.ok b/regress/sbin/pfctl/pf25.ok
index 3f3f22c18b3..17cb83ec1bf 100644
--- a/regress/sbin/pfctl/pf25.ok
+++ b/regress/sbin/pfctl/pf25.ok
@@ -3,7 +3,3 @@ block drop in on ! lo0 inet6 from ::1 to any
 block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any
 block drop in on ! lo0 from (lo0:network) to any
 block drop in log quick on ! lo0 inet from (lo0:network) to any
-block drop in on ! lo from (lo:network) to any
-block drop in from (lo) to any
-block drop in log quick on ! lo inet from (lo:network) to any
-block drop in log quick inet from (lo) to any