diff options
26 files changed, 94 insertions, 105 deletions
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index 9a9ac8e95ed..ebbb7683742 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -26,15 +26,15 @@ [ Skip steps: d=end p=end sp=end da=8 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 scrub in on lo0 inet from (lo0) to any fragment reassemble +@7 scrub in on lo0 inet from (lo0:1) to any fragment reassemble [ Skip steps: i=10 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 scrub in log on lo0 inet6 from (lo1000000) to 2000::1 fragment reassemble +@8 scrub in log on lo0 inet6 from (lo1000000:*) to 2000::1 fragment reassemble [ Skip steps: i=10 d=end f=10 p=end sp=end da=10 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 scrub in log on lo0 inet6 from (lo0) to 2000::1 fragment reassemble +@9 scrub in log on lo0 inet6 from (lo0:2) to 2000::1 fragment reassemble [ Skip steps: d=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.in b/regress/sbin/pfctl/pf17.in index 39ad77af803..d776ddbb2f5 100644 --- a/regress/sbin/pfctl/pf17.in +++ b/regress/sbin/pfctl/pf17.in @@ -17,22 +17,22 @@ binat on lo0 from 192.168.2.0/30 to 192.168.3.1 -> 10.0.3.0/30 binat on lo0 from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 binat on lo0 from 1.1.1.1 to no-route -> 2.2.2.2 -binat on lo0 from (lo0) to 1.1.1.1 -> 2.2.2.2 -binat on lo0 from (lo0) to 1.1.1.1 -> (lo1000000) -binat on lo0 inet from (lo0) to (lo1000000) -> (lo1000000) +binat on lo0 from (lo0:0) to 1.1.1.1 -> 2.2.2.2 +binat on lo0 from (lo0:0) to 1.1.1.1 -> (lo1000000:0) +binat on lo0 inet from (lo0:0) to (lo1000000:0) -> (lo1000000:0) binat on lo0 from 1.1.1.1 to <sometable> -> 2.2.2.2 binat on lo0 from 1.1.1.1 to !<sometable> -> 2.2.2.2 -binat on lo0 from 1.1.1.1 to (lo1000000) -> 2.2.2.2 -binat on lo0 from 1.1.1.1 to !(lo1000000) -> 2.2.2.2 -binat on lo0 from (lo0) to <sometable> -> 2.2.2.2 +binat on lo0 from 1.1.1.1 to (lo1000000:0) -> 2.2.2.2 +binat on lo0 from 1.1.1.1 to !(lo1000000:0) -> 2.2.2.2 +binat on lo0 from (lo0:0) to <sometable> -> 2.2.2.2 binat on lo0 from ::1 to no-route -> ::2 -binat on lo0 from (lo0) to ::1 -> ::2 -binat on lo0 from (lo0) to ::1 -> (lo1000000) -binat on lo0 inet6 from (lo0) to (lo1000000) -> (lo1000000) +binat on lo0 from (lo0:0) to ::1 -> ::2 +binat on lo0 from (lo0:0) to ::1 -> (lo1000000:0) +binat on lo0 inet6 from (lo0:0) to (lo1000000:0) -> (lo1000000:0) binat on lo0 from ::1 to <sometable> -> ::2 binat on lo0 from ::1 to !<sometable> -> ::2 -binat on lo0 from ::1 to (lo1000000) -> ::2 -binat on lo0 from ::1 to !(lo1000000) -> ::2 -binat on lo0 from (lo0) to <sometable> -> ::2 +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 diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded index 800379f0c19..7ad8356de0a 100644 --- a/regress/sbin/pfctl/pf17.loaded +++ b/regress/sbin/pfctl/pf17.loaded @@ -50,15 +50,15 @@ [ Skip steps: i=end 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) to 1.1.1.1 -> 2.2.2.2 +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1000000) +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 binat on lo0 inet from (lo0) to (lo1000000) -> (lo1000000) +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -70,15 +70,15 @@ [ Skip steps: i=end 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) -> 2.2.2.2 +@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 ] [ 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) -> 2.2.2.2 +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 binat on lo0 inet from (lo0) to <sometable:*> -> 2.2.2.2 +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -86,15 +86,15 @@ [ Skip steps: i=end 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) to ::1 -> ::2 +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 binat on lo0 inet6 from (lo0) to ::1 -> (lo1000000) +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 binat on lo0 inet6 from (lo0) to (lo1000000) -> (lo1000000) +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -106,15 +106,15 @@ [ Skip steps: i=end 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) -> ::2 +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 binat on lo0 inet6 from ::1 to ! (lo1000000) -> ::2 +@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 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@29 binat on lo0 inet6 from (lo0) to <sometable:*> -> ::2 +@29 binat on lo0 inet6 from (lo0:0:1) to <sometable:*> -> ::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 32d22c3b25c..a7d3fa89210 100644 --- a/regress/sbin/pfctl/pf17.ok +++ b/regress/sbin/pfctl/pf17.ok @@ -11,20 +11,20 @@ binat on lo0 inet from 192.168.2.0/28 to any -> 10.0.4.0/28 binat on lo0 inet from 192.168.2.0/30 to 192.168.3.1 -> 10.0.3.0/30 binat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 binat on lo0 inet from 1.1.1.1 to no-route -> 2.2.2.2 -binat on lo0 inet from (lo0) to 1.1.1.1 -> 2.2.2.2 -binat on lo0 inet from (lo0) to 1.1.1.1 -> (lo1000000) -binat on lo0 inet from (lo0) to (lo1000000) -> (lo1000000) +binat on lo0 inet from (lo0:0) to 1.1.1.1 -> 2.2.2.2 +binat on lo0 inet from (lo0:0) to 1.1.1.1 -> (lo1000000:0) +binat on lo0 inet from (lo0:0) to (lo1000000:0) -> (lo1000000:0) binat on lo0 inet from 1.1.1.1 to <sometable> -> 2.2.2.2 binat on lo0 inet from 1.1.1.1 to ! <sometable> -> 2.2.2.2 -binat on lo0 inet from 1.1.1.1 to (lo1000000) -> 2.2.2.2 -binat on lo0 inet from 1.1.1.1 to ! (lo1000000) -> 2.2.2.2 -binat on lo0 inet from (lo0) to <sometable> -> 2.2.2.2 +binat on lo0 inet from 1.1.1.1 to (lo1000000:0) -> 2.2.2.2 +binat on lo0 inet from 1.1.1.1 to ! (lo1000000:0) -> 2.2.2.2 +binat on lo0 inet from (lo0:0) to <sometable> -> 2.2.2.2 binat on lo0 inet6 from ::1 to no-route -> ::2 -binat on lo0 inet6 from (lo0) to ::1 -> ::2 -binat on lo0 inet6 from (lo0) to ::1 -> (lo1000000) -binat on lo0 inet6 from (lo0) to (lo1000000) -> (lo1000000) +binat on lo0 inet6 from (lo0:0) to ::1 -> ::2 +binat on lo0 inet6 from (lo0:0) to ::1 -> (lo1000000:0) +binat on lo0 inet6 from (lo0:0) to (lo1000000:0) -> (lo1000000:0) binat on lo0 inet6 from ::1 to <sometable> -> ::2 binat on lo0 inet6 from ::1 to ! <sometable> -> ::2 -binat on lo0 inet6 from ::1 to (lo1000000) -> ::2 -binat on lo0 inet6 from ::1 to ! (lo1000000) -> ::2 -binat on lo0 inet6 from (lo0) 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 diff --git a/regress/sbin/pfctl/pf18.loaded b/regress/sbin/pfctl/pf18.loaded index d21792e7f59..97ab8105b6a 100644 --- a/regress/sbin/pfctl/pf18.loaded +++ b/regress/sbin/pfctl/pf18.loaded @@ -54,7 +54,7 @@ [ Skip steps: i=16 d=end f=end p=16 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 nat on lo0 inet from 192.168.0.0/24 to any -> (lo0) +@14 nat on lo0 inet from 192.168.0.0/24 to any -> (lo0) round-robin [ Skip steps: i=16 d=end f=end p=16 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/pf18.ok b/regress/sbin/pfctl/pf18.ok index 56dce0ff03c..9cefeb26b7c 100644 --- a/regress/sbin/pfctl/pf18.ok +++ b/regress/sbin/pfctl/pf18.ok @@ -14,7 +14,7 @@ nat on lo0 inet from 192.168.1.6 to 172.16.2.0/24 -> 127.0.0.1 nat on lo0 inet from 192.168.1.7 to 172.6.1.1 -> 127.0.0.1 nat on lo0 inet from 192.168.1.7 to 172.14.1.2 -> 127.0.0.1 nat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 127.0.0.1 -nat on lo0 inet from 192.168.0.0/24 to any -> (lo0) +nat on lo0 inet from 192.168.0.0/24 to any -> (lo0) round-robin nat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8 nat on ! lo0 inet proto udp all -> 10.0.0.8 static-port nat on ! lo0 inet proto tcp all -> 10.0.0.8 static-port diff --git a/regress/sbin/pfctl/pf26.loaded b/regress/sbin/pfctl/pf26.loaded index a0ea0b9da23..ef79533eaba 100644 --- a/regress/sbin/pfctl/pf26.loaded +++ b/regress/sbin/pfctl/pf26.loaded @@ -1,8 +1,8 @@ -@0 block drop in on lo0 inet from ! (lo0) to any +@0 block drop in on lo0 inet from ! (lo0:1) to any [ Skip steps: i=end f=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 block drop out on lo0 inet from any to ! (lo0) +@1 block drop out on lo0 inet from any to ! (lo0:1) [ 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/pf27.loaded b/regress/sbin/pfctl/pf27.loaded index 04f724b010a..3a9874ea041 100644 --- a/regress/sbin/pfctl/pf27.loaded +++ b/regress/sbin/pfctl/pf27.loaded @@ -10,15 +10,15 @@ [ Skip steps: i=end d=end f=end p=end sa=4 sp=end da=4 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 nat on lo0 inet from any to 127.0.0.1 -> (lo0) +@3 nat on lo0 inet from any to 127.0.0.1 -> (lo0) round-robin [ Skip steps: i=end 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 ] -@4 nat on lo0 inet from 127.0.0.1 to any -> (lo0) +@4 nat on lo0 inet from 127.0.0.1 to any -> (lo0) round-robin [ Skip steps: i=end 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 ] -@5 nat on lo0 inet from any to (lo0) -> 127.0.0.1 +@5 nat on lo0 inet from any to (lo0:1) -> 127.0.0.1 [ 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 ] @@ -34,15 +34,15 @@ [ Skip steps: i=end d=end f=end p=end sa=4 sp=end da=4 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 rdr on lo0 inet from any to 127.0.0.1 -> (lo0) +@3 rdr on lo0 inet from any to 127.0.0.1 -> (lo0) round-robin [ Skip steps: i=end 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 ] -@4 rdr on lo0 inet from 127.0.0.1 to any -> (lo0) +@4 rdr on lo0 inet from 127.0.0.1 to any -> (lo0) round-robin [ Skip steps: i=end 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 ] -@5 rdr on lo0 inet from any to (lo0) -> 127.0.0.1 +@5 rdr on lo0 inet from any to (lo0:1) -> 127.0.0.1 [ 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/pf27.ok b/regress/sbin/pfctl/pf27.ok index dc3fafb55f8..d61ce87e89f 100644 --- a/regress/sbin/pfctl/pf27.ok +++ b/regress/sbin/pfctl/pf27.ok @@ -1,12 +1,12 @@ nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.1 nat on lo0 inet from 127.0.0.1 to any -> 127.0.0.1 nat on lo0 inet from any to 127.0.0.1 -> 127.0.0.1 -nat on lo0 inet from any to 127.0.0.1 -> (lo0) -nat on lo0 inet from 127.0.0.1 to any -> (lo0) +nat on lo0 inet from any to 127.0.0.1 -> (lo0) round-robin +nat on lo0 inet from 127.0.0.1 to any -> (lo0) round-robin nat on lo0 inet from any to (lo0) -> 127.0.0.1 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.1 rdr on lo0 inet from 127.0.0.1 to any -> 127.0.0.1 rdr on lo0 inet from any to 127.0.0.1 -> 127.0.0.1 -rdr on lo0 inet from any to 127.0.0.1 -> (lo0) -rdr on lo0 inet from 127.0.0.1 to any -> (lo0) +rdr on lo0 inet from any to 127.0.0.1 -> (lo0) round-robin +rdr on lo0 inet from 127.0.0.1 to any -> (lo0) round-robin rdr on lo0 inet from any to (lo0) -> 127.0.0.1 diff --git a/regress/sbin/pfctl/pf47.loaded b/regress/sbin/pfctl/pf47.loaded index 964ce21fa01..f674854fc3b 100644 --- a/regress/sbin/pfctl/pf47.loaded +++ b/regress/sbin/pfctl/pf47.loaded @@ -86,15 +86,15 @@ [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] [ 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)" +@22 pass in on lo0 inet from any to (lo0:1) label "(lo0)" [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ] [ 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)" +@23 pass in on lo0 inet from any to (lo0:1) label "(lo0)(lo0)" [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ] [ 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) " +@24 pass in on lo0 inet from any to (lo0:1) label " (lo0) (lo0) " [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -110,15 +110,15 @@ [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] [ 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)" +@28 pass in on lo0 inet6 from any to ! (lo0:2) label "! (lo0)" [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ] [ 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)" +@29 pass in on lo0 inet6 from any to ! (lo0:2) label "! (lo0)! (lo0)" [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ] [ 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) " +@30 pass in on lo0 inet6 from any to ! (lo0:2) label " ! (lo0) ! (lo0) " [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf49.in b/regress/sbin/pfctl/pf49.in index 8ad75862260..420ea2df004 100644 --- a/regress/sbin/pfctl/pf49.in +++ b/regress/sbin/pfctl/pf49.in @@ -1,5 +1,5 @@ #test :broadcast and :network modifiers pass in on lo0 from lo0:network to any keep state -#broadcast on lo0 doesn't make too much sense, the result looks scary.. no bug -block in on lo0 from any to lo0:broadcast +#broadcast on lo0 doesn't make sense at all! +#block in on lo0 from any to lo0:broadcast diff --git a/regress/sbin/pfctl/pf49.loaded b/regress/sbin/pfctl/pf49.loaded index 9b19385129b..b03fed6ea8d 100644 --- a/regress/sbin/pfctl/pf49.loaded +++ b/regress/sbin/pfctl/pf49.loaded @@ -1,12 +1,8 @@ @0 pass in on lo0 inet from 127.0.0.0/8 to any keep state - [ Skip steps: i=end d=end p=end sp=end da=2 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 pass in on lo0 inet6 from ::1 to any keep state - [ Skip steps: i=end d=end p=end sp=end dp=end ] - [ queue: qname= qid=0 pqname= pqid=0 ] - [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 block drop in on lo0 inet from any to 127.0.0.1 [ 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/pf49.ok b/regress/sbin/pfctl/pf49.ok index 5153674898b..6bb9f2d1778 100644 --- a/regress/sbin/pfctl/pf49.ok +++ b/regress/sbin/pfctl/pf49.ok @@ -1,3 +1,2 @@ pass in on lo0 inet from 127.0.0.0/8 to any keep state pass in on lo0 inet6 from ::1 to any keep state -block drop in on lo0 inet from any to 127.0.0.1 diff --git a/regress/sbin/pfctl/pf61.loaded b/regress/sbin/pfctl/pf61.loaded index 3668f3cf375..b8b15e0e4d6 100644 --- a/regress/sbin/pfctl/pf61.loaded +++ b/regress/sbin/pfctl/pf61.loaded @@ -1,4 +1,4 @@ -@0 pass inet from any to (lo0)/24 +@0 pass inet from any to (lo0:1)/24 [ 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/pf68.loaded b/regress/sbin/pfctl/pf68.loaded index 8be3060543a..5aafdf8807c 100644 --- a/regress/sbin/pfctl/pf68.loaded +++ b/regress/sbin/pfctl/pf68.loaded @@ -58,11 +58,11 @@ [ Skip steps: i=18 d=29 p=end sp=43 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 scrub in log on lo0 inet6 proto tcp from (lo1000000) to 2000::1 fragment reassemble +@15 scrub in log on lo0 inet6 proto tcp from (lo1000000:*) to 2000::1 fragment reassemble [ Skip steps: i=18 d=29 f=17 p=end sp=43 da=17 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 scrub in log on lo0 inet6 proto tcp from (lo0) to 2000::1 fragment reassemble +@16 scrub in log on lo0 inet6 proto tcp from (lo0:2) to 2000::1 fragment reassemble [ Skip steps: i=18 d=29 p=end sp=43 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -110,7 +110,7 @@ [ Skip steps: i=30 d=29 p=end sp=43 da=31 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 scrub in on lo0 inet proto tcp from (lo0) to any fragment reassemble +@28 scrub in on lo0 inet proto tcp from (lo0:1) to any fragment reassemble [ Skip steps: i=30 p=end sp=43 da=31 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -170,11 +170,11 @@ [ Skip steps: i=46 d=62 p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@43 scrub in log on lo0 inet6 proto tcp from (lo1000000) port = www to 2000::1 fragment reassemble +@43 scrub in log on lo0 inet6 proto tcp from (lo1000000:*) port = www to 2000::1 fragment reassemble [ Skip steps: i=46 d=62 f=45 p=end sp=48 da=45 dp=49 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@44 scrub in log on lo0 inet6 proto tcp from (lo0) port = www to 2000::1 fragment reassemble +@44 scrub in log on lo0 inet6 proto tcp from (lo0:2) port = www to 2000::1 fragment reassemble [ Skip steps: i=46 d=62 p=end sp=48 dp=49 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @@ -242,7 +242,7 @@ [ Skip steps: i=63 d=62 p=end da=63 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@61 scrub in on lo0 inet proto tcp from (lo0) port = www to any fragment reassemble +@61 scrub in on lo0 inet proto tcp from (lo0:1) port = www to any fragment reassemble [ Skip steps: i=63 p=end da=63 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf73.loaded b/regress/sbin/pfctl/pf73.loaded index c18f1064b94..eab606d6bb5 100644 --- a/regress/sbin/pfctl/pf73.loaded +++ b/regress/sbin/pfctl/pf73.loaded @@ -50,11 +50,11 @@ [ Skip steps: i=16 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 scrub log on lo0 inet6 proto tcp from (lo1000000) to 2000::1 reassemble tcp fragment reassemble +@13 scrub log on lo0 inet6 proto tcp from (lo1000000:*) to 2000::1 reassemble tcp fragment reassemble [ Skip steps: i=16 d=end f=15 p=end sp=end da=15 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 scrub log on lo0 inet6 proto tcp from (lo0) to 2000::1 reassemble tcp fragment reassemble +@14 scrub log on lo0 inet6 proto tcp from (lo0:2) to 2000::1 reassemble tcp fragment reassemble [ Skip steps: i=16 d=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/pf77.loaded b/regress/sbin/pfctl/pf77.loaded index 701ebee32d4..3c25d3b05b8 100644 --- a/regress/sbin/pfctl/pf77.loaded +++ b/regress/sbin/pfctl/pf77.loaded @@ -1,4 +1,4 @@ -@0 pass inet from (lo0)/8 to any +@0 pass inet from (lo0:1)/8 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/pf81.loaded b/regress/sbin/pfctl/pf81.loaded index 6e00f34f960..1c98f7fa04b 100644 --- a/regress/sbin/pfctl/pf81.loaded +++ b/regress/sbin/pfctl/pf81.loaded @@ -1,24 +1,24 @@ -@0 pass inet6 from (lo0) to ::1 - [ Skip steps: i=end d=end f=3 p=end sa=3 sp=end dp=end ] +@0 pass inet6 from (lo0:2) to ::1 + [ Skip steps: i=end d=end f=3 p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet6 from (lo0) to ::2 - [ Skip steps: i=end d=end f=3 p=end sa=3 sp=end dp=end ] +@1 pass inet6 from (lo0:2) to ::2 + [ Skip steps: i=end d=end f=3 p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet6 from (lo0) to ::3 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@2 pass inet6 from (lo0:2) to ::3 + [ Skip steps: i=end d=end p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet from (lo0) to 0.0.0.1 +@3 pass inet from (lo0:1) to 0.0.0.1 [ Skip steps: i=end d=end f=6 p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass inet from (lo0) to 0.0.0.2 +@4 pass inet from (lo0:1) to 0.0.0.2 [ Skip steps: i=end d=end f=6 p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass inet from (lo0) to 0.0.0.3 +@5 pass inet from (lo0:1) to 0.0.0.3 [ Skip steps: i=end d=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/pf82.loaded b/regress/sbin/pfctl/pf82.loaded index d0c133316ac..e0469fe3c51 100644 --- a/regress/sbin/pfctl/pf82.loaded +++ b/regress/sbin/pfctl/pf82.loaded @@ -1,16 +1,16 @@ -@0 pass inet from (lo0) to any +@0 pass inet from (lo0:1) to any [ Skip steps: i=end d=end f=3 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet from ! (lo0) to any +@1 pass inet from ! (lo0:1) to any [ Skip steps: i=end d=end f=3 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet from (lo0) to any - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@2 pass inet from (lo0:1) to any + [ Skip steps: i=end d=end p=end sa=4 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet6 from (lo0) to any +@3 pass inet6 from (lo0:2) to any [ 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 ] diff --git a/regress/sbin/pfctl/pfail14.ok b/regress/sbin/pfctl/pfail14.ok index bb2f05334af..6c2cd644683 100644 --- a/regress/sbin/pfctl/pfail14.ok +++ b/regress/sbin/pfctl/pfail14.ok @@ -1,3 +1 @@ -stdin:1: dynamic addresses require address family (inet/inet6) -stdin:1: skipping rule due to errors -stdin:1: rule expands to no valid combination +block drop in on lo0 from ! (lo0) to any diff --git a/regress/sbin/pfctl/pfail20.ok b/regress/sbin/pfctl/pfail20.ok index 5a677e2987a..b67e8873ac9 100644 --- a/regress/sbin/pfctl/pfail20.ok +++ b/regress/sbin/pfctl/pfail20.ok @@ -1,3 +1,3 @@ -stdin:3: address family not given and translation address expands to multiple address families -stdin:4: address family not given and translation address expands to multiple address families stdin:5: rule expands to no valid combination +rdr on lo0 all -> (lo0) round-robin +nat on lo0 from (lo0) to any -> (lo0) round-robin diff --git a/regress/sbin/pfctl/pfail25.ok b/regress/sbin/pfctl/pfail25.ok index 8a25d0a1813..4dbb8c1d9fa 100644 --- a/regress/sbin/pfctl/pfail25.ok +++ b/regress/sbin/pfctl/pfail25.ok @@ -1,5 +1,4 @@ stdin:1: scrub rules do not support 'quick' -stdin:2: scrub rules do not support '! <if>' stdin:3: no-df cannot be respecified stdin:4: min-ttl cannot be respecified stdin:5: illegal min-ttl value 256 @@ -9,3 +8,4 @@ stdin:8: fragcache cannot be respecified stdin:9: fragcache cannot be respecified stdin:10: fragcache cannot be respecified stdin:11: random-id cannot be respecified +scrub in on ! lo0 all fragment reassemble diff --git a/regress/sbin/pfctl/pfail32.ok b/regress/sbin/pfctl/pfail32.ok index baaca715fee..87edf349c02 100644 --- a/regress/sbin/pfctl/pfail32.ok +++ b/regress/sbin/pfctl/pfail32.ok @@ -1,5 +1 @@ -stdin:2: unknown interface gif3 -stdin:3: queue eins has no parent -stdin:3: errors in queue definition -stdin:4: queue zwei has no parent -stdin:4: errors in queue definition +pfctl: SIOCGIFMTU: Device not configured diff --git a/regress/sbin/pfctl/pfail33.ok b/regress/sbin/pfctl/pfail33.ok index 8763aaf3d4a..fd910e98ee8 100644 --- a/regress/sbin/pfctl/pfail33.ok +++ b/regress/sbin/pfctl/pfail33.ok @@ -1 +1 @@ -stdin:3: unknown interface gif2 +stdin:3: unknown cbq flag "invalid" diff --git a/regress/sbin/pfctl/pfail34.ok b/regress/sbin/pfctl/pfail34.ok index 8763aaf3d4a..2a9767dfc60 100644 --- a/regress/sbin/pfctl/pfail34.ok +++ b/regress/sbin/pfctl/pfail34.ok @@ -1 +1 @@ -stdin:3: unknown interface gif2 +stdin:3: unknown priq flag "invalid" diff --git a/regress/sbin/pfctl/pfr.addrs1 b/regress/sbin/pfctl/pfr.addrs1 index f2ed9426768..f8659ea9f1c 100644 --- a/regress/sbin/pfctl/pfr.addrs1 +++ b/regress/sbin/pfctl/pfr.addrs1 @@ -7,7 +7,7 @@ ::5 fe80::/16 2000::1 # interfaces -lo0 lo0/24 lo0:broadcast lo0:network +lo0 lo0/24 lo0:network # name resolution localhost |