Test new interface syntax.

6 files changed, 171 insertions, 36 deletions

diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in
index b9f987fd90d..8dd2f2b2ff6 100644
--- a/regress/sbin/pfctl/pf15.in
+++ b/regress/sbin/pfctl/pf15.in
@@ -9,3 +9,8 @@ scrub in log on lo0 inet6 from { (lo1000000), (lo0) } to 2000::1
 scrub in inet from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 }
 scrub in from { lo0 10.1.1.1 } to any
 scrub in from { 10.0.0.1 lo0 } to any
+scrub in from !lo0 to any
+scrub in from !lo
+scrub in on !lo0
+scrub in on !lo
+scrub in from (lo:network) to (lo)
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded
index ebbb7683742..f97cdf506a1 100644
--- a/regress/sbin/pfctl/pf15.loaded
+++ b/regress/sbin/pfctl/pf15.loaded
@@ -55,34 +55,70 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 scrub in inet from 127.0.0.1 to any fragment reassemble
-  [ Skip steps: i=16 d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=16 d=end p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 scrub in inet6 from ::1 to any fragment reassemble
-  [ Skip steps: d=end f=17 p=end sp=end da=end dp=end ]
+  [ Skip steps: d=end f=17 p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble
-  [ Skip steps: d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 scrub in inet from 10.1.1.1 to any fragment reassemble
-  [ Skip steps: i=21 d=end f=20 p=end sp=end da=end dp=end ]
+  [ Skip steps: i=21 d=end f=20 p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 scrub in inet from 10.0.0.1 to any fragment reassemble
-  [ Skip steps: i=21 d=end f=20 p=end sp=end da=end dp=end ]
+  [ Skip steps: i=21 d=end f=20 p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 scrub in inet from 127.0.0.1 to any fragment reassemble
-  [ Skip steps: i=21 d=end p=end sp=end da=end dp=end ]
+  [ Skip steps: i=21 d=end p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 scrub in inet6 from ::1 to any fragment reassemble
-  [ Skip steps: d=end f=end p=end sp=end da=end dp=end ]
+  [ Skip steps: d=end f=22 p=end sp=end da=30 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble
+  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@22 scrub in inet from ! 127.0.0.1 to any fragment reassemble
+  [ Skip steps: i=24 d=end p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@23 scrub in inet6 from ! ::1 to any fragment reassemble
+  [ Skip steps: d=end f=25 p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@24 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
+  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@25 scrub in inet from ! 127.0.0.1 to any fragment reassemble
+  [ Skip steps: i=27 d=end p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@26 scrub in inet6 from ! ::1 to any fragment reassemble
+  [ Skip steps: d=end f=28 p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@27 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
+  [ Skip steps: d=end p=end sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@28 scrub in on ! lo0 all fragment reassemble
+  [ Skip steps: d=end f=end p=end sa=30 sp=end da=30 dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@29 scrub in on ! lo all fragment reassemble
+  [ 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     ]
+@30 scrub in from (lo:network:2) to (lo:3) fragment reassemble
   [ 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/pf15.ok b/regress/sbin/pfctl/pf15.ok
index 77112864b73..5e1e3b3f5b2 100644
--- a/regress/sbin/pfctl/pf15.ok
+++ b/regress/sbin/pfctl/pf15.ok
@@ -20,3 +20,12 @@ scrub in inet from 10.0.0.1 to any fragment reassemble
 scrub in inet from 127.0.0.1 to any fragment reassemble
 scrub in inet6 from ::1 to any fragment reassemble
 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble
+scrub in inet from ! 127.0.0.1 to any fragment reassemble
+scrub in inet6 from ! ::1 to any fragment reassemble
+scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
+scrub in inet from ! 127.0.0.1 to any fragment reassemble
+scrub in inet6 from ! ::1 to any fragment reassemble
+scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble
+scrub in on ! lo0 all fragment reassemble
+scrub in on ! lo all fragment reassemble
+scrub in from (lo:network) to (lo) fragment reassemble
diff --git a/regress/sbin/pfctl/pf17.in b/regress/sbin/pfctl/pf17.in
index d776ddbb2f5..72333a10085 100644
--- a/regress/sbin/pfctl/pf17.in
+++ b/regress/sbin/pfctl/pf17.in
@@ -36,3 +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 (self) -> ::1
+binat on lo0 from ::1 to (self:0) -> ::1
+binat on lo0 from ::1 to (self:peer) -> ::1
+binat on lo0 from ::1 to (self:peer:0) -> ::1
+binat on lo0 from ::1 to (self:broadcast) -> ::1
+binat on lo0 from ::1 to (self:broadcast:0) -> ::1
+binat on lo0 from ::1 to (self:network) -> ::1
+binat on lo0 from ::1 to (self:network:0) -> ::1
+binat on lo0 from ::1 to (self)/100 -> ::2
+binat on lo0 from ::1 to (self:0)/100 -> ::2
+binat on lo0 from ::1 to (self:peer)/100 -> ::2
+binat on lo0 from ::1 to (self: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 7ad8356de0a..96c24cf03b3 100644
--- a/regress/sbin/pfctl/pf17.loaded
+++ b/regress/sbin/pfctl/pf17.loaded
@@ -1,120 +1,176 @@
 @0 no binat on lo0 inet from 192.168.1.1 to 10.1.2.3
-  [ Skip steps: i=end d=end f=21 p=2 sa=2 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=2 sa=2 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 binat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
-  [ Skip steps: i=end d=end f=21 sp=end da=5 dp=end ]
+  [ Skip steps: i=42 d=end f=21 sp=end da=5 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 binat on lo0 inet proto tcp from 192.168.1.2 to any -> 10.0.0.2
-  [ Skip steps: i=end d=end f=21 sp=end da=5 dp=end ]
+  [ Skip steps: i=42 d=end f=21 sp=end da=5 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 binat on lo0 inet proto udp from 192.168.1.3 to any -> 10.0.0.3
-  [ Skip steps: i=end d=end f=21 sp=end da=5 dp=end ]
+  [ Skip steps: i=42 d=end f=21 sp=end da=5 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 binat on lo0 inet proto icmp from 192.168.1.4 to any -> 10.0.0.4
-  [ Skip steps: i=end d=end f=21 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 binat on lo0 inet from 192.168.1.5 to 172.16.1.1 -> 10.0.0.5
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 binat on lo0 inet from 192.168.1.6 to 172.16.1.2 -> 10.0.0.6
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 binat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 10.0.0.7
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 binat on lo0 inet from 192.168.2.0/24 to any -> 10.0.5.0/24
-  [ Skip steps: i=end d=end f=21 p=end sp=end da=10 dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end da=10 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 binat on lo0 inet from 192.168.2.0/28 to any -> 10.0.4.0/28
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 binat on lo0 inet from 192.168.2.0/30 to 192.168.3.1 -> 10.0.3.0/30
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 binat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 binat on lo0 inet from 1.1.1.1 to no-route -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 binat on lo0 inet from (lo0:0:1) to 1.1.1.1 -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sa=16 sp=end da=15 dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sa=16 sp=end da=15 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 binat on lo0 inet from (lo0:0:1) to 1.1.1.1 -> (lo1000000:0)
-  [ Skip steps: i=end d=end f=21 p=end sa=16 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sa=16 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 binat on lo0 inet from (lo0:0:1) to (lo1000000:0:*) -> (lo1000000:0)
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 binat on lo0 inet from 1.1.1.1 to <sometable:*> -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sa=20 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 binat on lo0 inet from 1.1.1.1 to ! <sometable:*> -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sa=20 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 binat on lo0 inet from 1.1.1.1 to (lo1000000:0:*) -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sa=20 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sa=20 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 binat on lo0 inet from 1.1.1.1 to ! (lo1000000:0:*) -> 2.2.2.2
-  [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 binat on lo0 inet from (lo0:0:1) to <sometable:*> -> 2.2.2.2
-  [ Skip steps: i=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=42 d=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 binat on lo0 inet6 from ::1 to no-route -> ::2
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ 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     ]
 @22 binat on lo0 inet6 from (lo0:0:1) to ::1 -> ::2
-  [ Skip steps: i=end d=end f=end p=end sa=25 sp=end da=24 dp=end ]
+  [ Skip steps: i=42 d=end f=end p=end sa=25 sp=end da=24 dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 binat on lo0 inet6 from (lo0:0:1) to ::1 -> (lo1000000:0)
-  [ Skip steps: i=end d=end f=end p=end sa=25 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=end p=end sa=25 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 binat on lo0 inet6 from (lo0:0:1) to (lo1000000:0:*) -> (lo1000000:0)
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ 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     ]
 @25 binat on lo0 inet6 from ::1 to <sometable:*> -> ::2
-  [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=end p=end sa=29 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 binat on lo0 inet6 from ::1 to ! <sometable:*> -> ::2
-  [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=end p=end sa=29 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 binat on lo0 inet6 from ::1 to (lo1000000:0:*) -> ::2
-  [ Skip steps: i=end d=end f=end p=end sa=29 sp=end dp=end ]
+  [ Skip steps: i=42 d=end f=end p=end sa=29 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 binat on lo0 inet6 from ::1 to ! (lo1000000:0:*) -> ::2
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ 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     ]
 @29 binat on lo0 inet6 from (lo0:0:1) to <sometable:*> -> ::2
+  [ 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 (self:3) -> ::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 (self:0: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     ]
+@32 binat on lo0 inet6 from ::1 to (self: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 (self: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 (self: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 (self: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 (self: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 (self: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 (self:3)/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 (self:0: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     ]
+@40 binat on lo0 inet6 from ::1 to (self: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 (self: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     ]
+@42 binat on lo inet6 from (lo0:0:1) to ::1 -> ::2
+  [ Skip steps: 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     ]
+@43 binat on tun inet6 from (lo0:0:1) to ::1 -> ::2
   [ 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/pf17.ok b/regress/sbin/pfctl/pf17.ok
index a7d3fa89210..0304b56f013 100644
--- a/regress/sbin/pfctl/pf17.ok
+++ b/regress/sbin/pfctl/pf17.ok
@@ -28,3 +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 (self) -> ::1
+binat on lo0 inet6 from ::1 to (self:0) -> ::1
+binat on lo0 inet6 from ::1 to (self:peer) -> ::1
+binat on lo0 inet6 from ::1 to (self:peer:0) -> ::1
+binat on lo0 inet6 from ::1 to (self:broadcast) -> ::1
+binat on lo0 inet6 from ::1 to (self:broadcast:0) -> ::1
+binat on lo0 inet6 from ::1 to (self:network) -> ::1
+binat on lo0 inet6 from ::1 to (self:network:0) -> ::1
+binat on lo0 inet6 from ::1 to (self)/100 -> ::2
+binat on lo0 inet6 from ::1 to (self:0)/100 -> ::2
+binat on lo0 inet6 from ::1 to (self:peer)/100 -> ::2
+binat on lo0 inet6 from ::1 to (self:peer:0)/100 -> ::2
+binat on lo inet6 from (lo0:0) to ::1 -> ::2
+binat on tun inet6 from (lo0:0) to ::1 -> ::2