diff options
198 files changed, 2474 insertions, 2467 deletions
diff --git a/regress/sbin/pfctl/pf1.loaded b/regress/sbin/pfctl/pf1.loaded index 2d7d41d54ee..ee65a3de3b8 100644 --- a/regress/sbin/pfctl/pf1.loaded +++ b/regress/sbin/pfctl/pf1.loaded @@ -1,32 +1,32 @@ -@0 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ] +@0 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=4 p=2 sa=4 da=4 sp=2 dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in all no state - [ Skip steps: i=end d=end f=4 sa=4 da=4 dp=3 ] + [ Skip steps: i=end r=end d=end f=4 sa=4 da=4 dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in proto tcp from any port <= 1024 to any flags S/SA keep state label "foo_bar" - [ Skip steps: i=end d=end f=4 p=5 sa=4 da=4 ] +@2 pass in proto tcp from any port <= 1024 to any flags S/SA label "foo_bar" + [ Skip steps: i=end r=end d=end f=4 p=5 sa=4 da=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in proto tcp from any to any port = smtp flags S/SA keep state - [ Skip steps: i=end d=end p=5 ] +@3 pass in proto tcp from any to any port = smtp flags S/SA + [ Skip steps: i=end r=end d=end p=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=6 ] +@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 keep state allow-opts - [ Skip steps: i=end d=end f=end sp=end dp=end ] +@5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts + [ Skip steps: i=end r=end d=end f=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet proto tcp from 1.2.3.4 to any flags S/SA keep state label "6:tcp:1.2.3.4::any:" - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@6 pass in inet proto tcp from 1.2.3.4 to any flags S/SA label "6:tcp:1.2.3.4::any:" + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in inet proto tcp from 1.2.3.5 to any flags S/SA keep state label "7:tcp:1.2.3.5::any:" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@7 pass in inet proto tcp from 1.2.3.5 to any flags S/SA label "7:tcp:1.2.3.5::any:" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf1.ok b/regress/sbin/pfctl/pf1.ok index 10fb28bb33d..b8ced2dd03b 100644 --- a/regress/sbin/pfctl/pf1.ok +++ b/regress/sbin/pfctl/pf1.ok @@ -1,8 +1,8 @@ -pass in all flags S/SA keep state +pass in all flags S/SA pass in all no state -pass in proto tcp from any port <= 1024 to any flags S/SA keep state label "foo_bar" -pass in proto tcp from any to any port = smtp flags S/SA keep state -pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA keep state -pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 keep state allow-opts -pass in inet proto tcp from 1.2.3.4 to any flags S/SA keep state label "6:tcp:1.2.3.4::any:" -pass in inet proto tcp from 1.2.3.5 to any flags S/SA keep state label "7:tcp:1.2.3.5::any:" +pass in proto tcp from any port <= 1024 to any flags S/SA label "foo_bar" +pass in proto tcp from any to any port = smtp flags S/SA +pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA +pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts +pass in inet proto tcp from 1.2.3.4 to any flags S/SA label "6:tcp:1.2.3.4::any:" +pass in inet proto tcp from 1.2.3.5 to any flags S/SA label "7:tcp:1.2.3.5::any:" diff --git a/regress/sbin/pfctl/pf1.optimized b/regress/sbin/pfctl/pf1.optimized index 2d7d41d54ee..ee65a3de3b8 100644 --- a/regress/sbin/pfctl/pf1.optimized +++ b/regress/sbin/pfctl/pf1.optimized @@ -1,32 +1,32 @@ -@0 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ] +@0 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=4 p=2 sa=4 da=4 sp=2 dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in all no state - [ Skip steps: i=end d=end f=4 sa=4 da=4 dp=3 ] + [ Skip steps: i=end r=end d=end f=4 sa=4 da=4 dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in proto tcp from any port <= 1024 to any flags S/SA keep state label "foo_bar" - [ Skip steps: i=end d=end f=4 p=5 sa=4 da=4 ] +@2 pass in proto tcp from any port <= 1024 to any flags S/SA label "foo_bar" + [ Skip steps: i=end r=end d=end f=4 p=5 sa=4 da=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in proto tcp from any to any port = smtp flags S/SA keep state - [ Skip steps: i=end d=end p=5 ] +@3 pass in proto tcp from any to any port = smtp flags S/SA + [ Skip steps: i=end r=end d=end p=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=6 ] +@4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 keep state allow-opts - [ Skip steps: i=end d=end f=end sp=end dp=end ] +@5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts + [ Skip steps: i=end r=end d=end f=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet proto tcp from 1.2.3.4 to any flags S/SA keep state label "6:tcp:1.2.3.4::any:" - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@6 pass in inet proto tcp from 1.2.3.4 to any flags S/SA label "6:tcp:1.2.3.4::any:" + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in inet proto tcp from 1.2.3.5 to any flags S/SA keep state label "7:tcp:1.2.3.5::any:" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@7 pass in inet proto tcp from 1.2.3.5 to any flags S/SA label "7:tcp:1.2.3.5::any:" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf10.loaded b/regress/sbin/pfctl/pf10.loaded index 04f75737b02..002dd1286d8 100644 --- a/regress/sbin/pfctl/pf10.loaded +++ b/regress/sbin/pfctl/pf10.loaded @@ -1,120 +1,120 @@ -@0 pass in inet proto icmp all keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@0 pass in inet proto icmp all + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet6 proto ipv6-icmp all keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@1 pass in inet6 proto ipv6-icmp all + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in inet proto icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-rst in inet proto tcp all - [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-rst in inet6 proto tcp all - [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block return-rst(ttl 10) in inet proto tcp all - [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block return-rst(ttl 10) in inet6 proto tcp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block return-icmp(port-unr) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block return-icmp(net-unr) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block return-icmp(net-unr) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block return-icmp(srcfail) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block return-icmp(srcfail) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block return-icmp(host-prohib) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block return-icmp(host-prohib) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block return-icmp(cutoff-preced) in inet proto icmp all - [ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 block return-icmp(cutoff-preced) in inet proto icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 block return-icmp(srcfail, admin-unr) in all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 block return-icmp(srcfail, admin-unr) in all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf10.ok b/regress/sbin/pfctl/pf10.ok index 4003c2306e9..4b331a33da3 100644 --- a/regress/sbin/pfctl/pf10.ok +++ b/regress/sbin/pfctl/pf10.ok @@ -1,5 +1,5 @@ -pass in inet proto icmp all keep state -pass in inet6 proto ipv6-icmp all keep state +pass in inet proto icmp all +pass in inet6 proto ipv6-icmp all block drop in inet proto icmp all block drop in inet6 proto ipv6-icmp all block return-rst in inet proto tcp all diff --git a/regress/sbin/pfctl/pf10.optimized b/regress/sbin/pfctl/pf10.optimized index a9b4e8075ab..1e83b4f99df 100644 --- a/regress/sbin/pfctl/pf10.optimized +++ b/regress/sbin/pfctl/pf10.optimized @@ -1,76 +1,76 @@ -@0 pass in inet proto icmp all keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@0 pass in inet proto icmp all + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet6 proto ipv6-icmp all keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@1 pass in inet6 proto ipv6-icmp all + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in inet proto icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-rst in inet proto tcp all - [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-rst in inet6 proto tcp all - [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block return-rst(ttl 10) in inet proto tcp all - [ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block return-rst(ttl 10) in inet6 proto tcp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block return-icmp(port-unr) in inet proto icmp all - [ Skip steps: i=end d=end f=13 p=13 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=13 p=13 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block return-icmp(net-unr) in inet proto icmp all - [ Skip steps: i=end d=end f=13 p=13 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=13 p=13 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block return-icmp(srcfail) in inet proto icmp all - [ Skip steps: i=end d=end f=13 p=13 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=13 p=13 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block return-icmp(host-prohib) in inet proto icmp all - [ Skip steps: i=end d=end f=13 p=13 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=13 p=13 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block return-icmp(cutoff-preced) in inet proto icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=18 p=18 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=18 p=18 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=18 p=18 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=18 p=18 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=18 p=18 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=18 p=18 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end f=18 p=18 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=18 p=18 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 block return-icmp(srcfail, admin-unr) in all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf100.loaded b/regress/sbin/pfctl/pf100.loaded index f94ed23aded..d17bb21f85b 100644 --- a/regress/sbin/pfctl/pf100.loaded +++ b/regress/sbin/pfctl/pf100.loaded @@ -1,71 +1,71 @@ -@0 pass all flags S/SA keep state - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] +@0 pass all flags S/SA + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 anchor "a/b" all { - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @2 anchor "1/2/3" all { - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @3 anchor "relative" all { - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass in on lo0 all flags S/SA keep state label "TEST1" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in on lo0 all flags S/SA label "TEST1" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @4 anchor "camield/*" all { - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] - [ Skip steps: i=0 d=0 f=0 p=0 sa=0 sp=0 da=0 dp=0 ] + [ Skip steps: i=0 r=0 d=0 f=0 p=0 sa=0 da=0 sp=0 dp=0 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @5 anchor "relayd/*" all { - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] - [ Skip steps: i=0 d=0 f=0 p=0 sa=0 sp=0 da=0 dp=0 ] + [ Skip steps: i=0 r=0 d=0 f=0 p=0 sa=0 da=0 sp=0 dp=0 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @6 anchor "foo" in on lo0 all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor "bar" in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor "/1/2/3" all { - [ Skip steps: i=2 d=2 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=2 r=2 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @1 anchor "/relative" all { - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } -@2 pass in on lo0 all flags S/SA keep state label "FOO" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on lo0 all flags S/SA label "FOO" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @1 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass in on lo0 all flags S/SA keep state label "BAR" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in on lo0 all flags S/SA label "BAR" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf100.ok b/regress/sbin/pfctl/pf100.ok index 9f4427379bc..0837ac280f0 100644 --- a/regress/sbin/pfctl/pf100.ok +++ b/regress/sbin/pfctl/pf100.ok @@ -1,8 +1,8 @@ -pass all flags S/SA keep state +pass all flags S/SA anchor "a/b" all anchor "1/2/3" all anchor "relative" all { - pass in on lo0 all flags S/SA keep state label "TEST1" + pass in on lo0 all flags S/SA label "TEST1" } anchor "camield/*" all anchor "relayd/*" all @@ -10,9 +10,9 @@ anchor "foo" in on lo0 all { anchor "bar" in all { anchor "/1/2/3" all anchor "/relative" all - pass in on lo0 all flags S/SA keep state label "FOO" + pass in on lo0 all flags S/SA label "FOO" } anchor in all { - pass in on lo0 all flags S/SA keep state label "BAR" + pass in on lo0 all flags S/SA label "BAR" } } diff --git a/regress/sbin/pfctl/pf100.optimized b/regress/sbin/pfctl/pf100.optimized index 65b0a2fea17..45449786934 100644 --- a/regress/sbin/pfctl/pf100.optimized +++ b/regress/sbin/pfctl/pf100.optimized @@ -1,28 +1,28 @@ -@0 pass all flags S/SA keep state - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] +@0 pass all flags S/SA + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 anchor "a/b" all - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 anchor "1/2/3" all - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 anchor "relative" all - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 anchor "camield/*" all - [ Skip steps: i=6 d=6 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 anchor "relayd/*" all - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 anchor "foo" in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf11.loaded b/regress/sbin/pfctl/pf11.loaded index 8728d761725..aee2929ff6f 100644 --- a/regress/sbin/pfctl/pf11.loaded +++ b/regress/sbin/pfctl/pf11.loaded @@ -1,72 +1,72 @@ -@0 pass in inet proto icmp all icmp-type echorep keep state - [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +@0 pass in inet proto icmp all icmp-type echorep + [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet proto icmp all icmp-type echorep code 0 keep state - [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +@1 pass in inet proto icmp all icmp-type echorep code 0 + [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in inet proto icmp all icmp-type 1 keep state - [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +@2 pass in inet proto icmp all icmp-type 1 + [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in inet proto icmp all icmp-type 1 code 1 keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@3 pass in inet proto icmp all icmp-type 1 code 1 + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet6 proto ipv6-icmp all icmp6-type 0 keep state - [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +@4 pass in inet6 proto ipv6-icmp all icmp6-type 0 + [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 keep state - [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +@5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 + [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet6 proto ipv6-icmp all icmp6-type unreach keep state - [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +@6 pass in inet6 proto ipv6-icmp all icmp6-type unreach + [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in inet proto icmp all icmp-type echorep - [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in inet proto icmp all icmp-type echorep code 0 - [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in inet proto icmp all icmp-type 1 - [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in inet proto icmp all icmp-type 1 code 1 - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in inet6 proto ipv6-icmp all icmp6-type 0 - [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 - [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop in inet6 proto ipv6-icmp all icmp6-type unreach - [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in inet proto icmp all icmp-type unreach code needfrag keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@16 pass in inet proto icmp all icmp-type unreach code needfrag + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf11.ok b/regress/sbin/pfctl/pf11.ok index 1268e772db2..a7dbcb85fe5 100644 --- a/regress/sbin/pfctl/pf11.ok +++ b/regress/sbin/pfctl/pf11.ok @@ -1,11 +1,11 @@ -pass in inet proto icmp all icmp-type echorep keep state -pass in inet proto icmp all icmp-type echorep code 0 keep state -pass in inet proto icmp all icmp-type 1 keep state -pass in inet proto icmp all icmp-type 1 code 1 keep state -pass in inet6 proto ipv6-icmp all icmp6-type 0 keep state -pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 keep state -pass in inet6 proto ipv6-icmp all icmp6-type unreach keep state -pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr keep state +pass in inet proto icmp all icmp-type echorep +pass in inet proto icmp all icmp-type echorep code 0 +pass in inet proto icmp all icmp-type 1 +pass in inet proto icmp all icmp-type 1 code 1 +pass in inet6 proto ipv6-icmp all icmp6-type 0 +pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 +pass in inet6 proto ipv6-icmp all icmp6-type unreach +pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr block drop in inet proto icmp all icmp-type echorep block drop in inet proto icmp all icmp-type echorep code 0 block drop in inet proto icmp all icmp-type 1 @@ -14,5 +14,5 @@ block drop in inet6 proto ipv6-icmp all icmp6-type 0 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 block drop in inet6 proto ipv6-icmp all icmp6-type unreach block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr -pass in inet proto icmp all icmp-type unreach code needfrag keep state -pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb keep state +pass in inet proto icmp all icmp-type unreach code needfrag +pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb diff --git a/regress/sbin/pfctl/pf11.optimized b/regress/sbin/pfctl/pf11.optimized index 8728d761725..aee2929ff6f 100644 --- a/regress/sbin/pfctl/pf11.optimized +++ b/regress/sbin/pfctl/pf11.optimized @@ -1,72 +1,72 @@ -@0 pass in inet proto icmp all icmp-type echorep keep state - [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +@0 pass in inet proto icmp all icmp-type echorep + [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet proto icmp all icmp-type echorep code 0 keep state - [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +@1 pass in inet proto icmp all icmp-type echorep code 0 + [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in inet proto icmp all icmp-type 1 keep state - [ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +@2 pass in inet proto icmp all icmp-type 1 + [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in inet proto icmp all icmp-type 1 code 1 keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@3 pass in inet proto icmp all icmp-type 1 code 1 + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet6 proto ipv6-icmp all icmp6-type 0 keep state - [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +@4 pass in inet6 proto ipv6-icmp all icmp6-type 0 + [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 keep state - [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +@5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 + [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet6 proto ipv6-icmp all icmp6-type unreach keep state - [ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +@6 pass in inet6 proto ipv6-icmp all icmp6-type unreach + [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in inet proto icmp all icmp-type echorep - [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in inet proto icmp all icmp-type echorep code 0 - [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in inet proto icmp all icmp-type 1 - [ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in inet proto icmp all icmp-type 1 code 1 - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in inet6 proto ipv6-icmp all icmp6-type 0 - [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 - [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop in inet6 proto ipv6-icmp all icmp6-type unreach - [ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in inet proto icmp all icmp-type unreach code needfrag keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@16 pass in inet proto icmp all icmp-type unreach code needfrag + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf12.loaded b/regress/sbin/pfctl/pf12.loaded index 9a3c77fc37a..37fd1d4e8f8 100644 --- a/regress/sbin/pfctl/pf12.loaded +++ b/regress/sbin/pfctl/pf12.loaded @@ -1,20 +1,20 @@ @0 pass in inet from 127.0.0.1 to 127.0.0.0/8 no state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] -@2 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@2 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA + [ Skip steps: i=end r=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 ] -@3 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@3 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@4 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf12.ok b/regress/sbin/pfctl/pf12.ok index 4ca6765f377..c45d1d00677 100644 --- a/regress/sbin/pfctl/pf12.ok +++ b/regress/sbin/pfctl/pf12.ok @@ -1,5 +1,5 @@ pass in inet from 127.0.0.1 to 127.0.0.0/8 no state pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state -pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA keep state -pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA keep state -pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA keep state +pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA +pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA +pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA diff --git a/regress/sbin/pfctl/pf12.optimized b/regress/sbin/pfctl/pf12.optimized index faf666d78e4..66cd8383539 100644 --- a/regress/sbin/pfctl/pf12.optimized +++ b/regress/sbin/pfctl/pf12.optimized @@ -1,20 +1,20 @@ @0 pass in inet from 127.0.0.1 to 127.0.0.0/8 no state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] -@2 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=4 sp=end dp=end ] +@2 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@3 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA + [ Skip steps: i=end r=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 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@4 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf13.in b/regress/sbin/pfctl/pf13.in index bfed24e11bb..3cf1d9e2443 100644 --- a/regress/sbin/pfctl/pf13.in +++ b/regress/sbin/pfctl/pf13.in @@ -1,6 +1,6 @@ -pass in quick on enc0 from any to any fastroute -pass in quick on enc0 inet from any to any fastroute -pass in quick on enc0 inet6 from any to any fastroute +pass in quick on enc0 from any to any +pass in quick on enc0 inet from any to any +pass in quick on enc0 inet6 from any to any pass out quick on tun1000000 inet from any to any route-to tun1000001 pass out quick on tun1000000 from any to 192.168.1.1 route-to tun1000001 diff --git a/regress/sbin/pfctl/pf13.loaded b/regress/sbin/pfctl/pf13.loaded index 225a37d41ba..433cae5e75e 100644 --- a/regress/sbin/pfctl/pf13.loaded +++ b/regress/sbin/pfctl/pf13.loaded @@ -1,64 +1,64 @@ -@0 pass in quick on enc0 all flags S/SA keep state fastroute - [ Skip steps: i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ] +@0 pass in quick on enc0 all flags S/SA + [ Skip steps: i=3 r=3 d=end p=6 sa=8 da=4 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in quick on enc0 inet all flags S/SA keep state fastroute - [ Skip steps: i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ] +@1 pass in quick on enc0 inet all flags S/SA + [ Skip steps: i=3 r=3 d=end p=6 sa=8 da=4 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in quick on enc0 inet6 all flags S/SA keep state fastroute - [ Skip steps: p=6 sa=8 sp=end da=4 dp=6 ] +@2 pass in quick on enc0 inet6 all flags S/SA + [ Skip steps: d=end p=6 sa=8 da=4 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out quick on tun1000000 inet all flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=6 f=5 p=6 sa=8 sp=end dp=6 ] +@3 pass out quick on tun1000000 inet all flags S/SA route-to tun1000001 + [ Skip steps: i=end r=6 d=end f=5 p=6 sa=8 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out quick on tun1000000 inet from any to 192.168.1.1 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=6 p=6 sa=8 sp=end dp=6 ] +@4 pass out quick on tun1000000 inet from any to 192.168.1.1 flags S/SA route-to tun1000001 + [ Skip steps: i=end r=6 d=end p=6 sa=8 sp=end dp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end sa=8 sp=end ] +@5 pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA route-to tun1000001 + [ Skip steps: i=end d=end sa=8 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in on tun1000000 inet proto tcp from any to any port = ftp dup-to 192.168.1.1@tun1000001 - [ Skip steps: i=end d=end p=8 sa=8 sp=end da=8 dp=8 ] + [ Skip steps: i=end r=end d=end p=8 sa=8 da=8 sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp dup-to fec0::1@tun1000001 - [ Skip steps: i=end d=end sp=end ] + [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=end p=10 sp=end dp=10 ] +@8 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA route-to tun1000001 + [ Skip steps: i=end r=end d=end p=10 sp=end dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=end sp=end ] +@9 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA route-to tun1000001 + [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in on tun1000000 inet proto tcp from any to any port = ftp reply-to 192.168.1.1@tun1000001 - [ Skip steps: i=end d=end p=12 sa=12 sp=end da=12 dp=12 ] + [ Skip steps: i=end r=end d=end p=12 sa=12 da=12 sp=end dp=12 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp reply-to fec0::1@tun1000001 - [ Skip steps: i=end d=end sp=end ] + [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state reply-to tun1000001 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@12 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA reply-to tun1000001 + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state reply-to tun1000001 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@13 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA reply-to tun1000001 + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state dup-to 192.168.1.100@tun1000001 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@14 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA dup-to 192.168.1.100@tun1000001 + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state dup-to fec1::2@tun1000001 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@15 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA dup-to fec1::2@tun1000001 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf13.ok b/regress/sbin/pfctl/pf13.ok index b41a6690770..98a7dbfb17d 100644 --- a/regress/sbin/pfctl/pf13.ok +++ b/regress/sbin/pfctl/pf13.ok @@ -1,16 +1,16 @@ -pass in quick on enc0 all flags S/SA keep state fastroute -pass in quick on enc0 inet all flags S/SA keep state fastroute -pass in quick on enc0 inet6 all flags S/SA keep state fastroute -pass out quick on tun1000000 inet all flags S/SA keep state route-to tun1000001 -pass out quick on tun1000000 inet from any to 192.168.1.1 flags S/SA keep state route-to tun1000001 -pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA keep state route-to tun1000001 +pass in quick on enc0 all flags S/SA +pass in quick on enc0 inet all flags S/SA +pass in quick on enc0 inet6 all flags S/SA +pass out quick on tun1000000 inet all flags S/SA route-to tun1000001 +pass out quick on tun1000000 inet from any to 192.168.1.1 flags S/SA route-to tun1000001 +pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA route-to tun1000001 block drop in on tun1000000 inet proto tcp from any to any port = ftp dup-to 192.168.1.1@tun1000001 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp dup-to fec0::1@tun1000001 -pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state route-to tun1000001 -pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state route-to tun1000001 +pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA route-to tun1000001 +pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA route-to tun1000001 block drop in on tun1000000 inet proto tcp from any to any port = ftp reply-to 192.168.1.1@tun1000001 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp reply-to fec0::1@tun1000001 -pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state reply-to tun1000001 -pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state reply-to tun1000001 -pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state dup-to 192.168.1.100@tun1000001 -pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state dup-to fec1::2@tun1000001 +pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA reply-to tun1000001 +pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA reply-to tun1000001 +pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA dup-to 192.168.1.100@tun1000001 +pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA dup-to fec1::2@tun1000001 diff --git a/regress/sbin/pfctl/pf13.optimized b/regress/sbin/pfctl/pf13.optimized index 53ccd841560..539493fccf4 100644 --- a/regress/sbin/pfctl/pf13.optimized +++ b/regress/sbin/pfctl/pf13.optimized @@ -1,52 +1,52 @@ -@0 pass in quick on enc0 all flags S/SA keep state fastroute - [ Skip steps: p=3 sa=5 sp=end da=2 dp=3 ] +@0 pass in quick on enc0 all flags S/SA + [ Skip steps: d=end p=3 sa=5 da=2 sp=end dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out quick on tun1000000 inet all flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=3 p=3 sa=5 sp=end dp=3 ] +@1 pass out quick on tun1000000 inet all flags S/SA route-to tun1000001 + [ Skip steps: i=end r=3 d=end p=3 sa=5 sp=end dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end sa=5 sp=end ] +@2 pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA route-to tun1000001 + [ Skip steps: i=end d=end sa=5 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in on tun1000000 inet proto tcp from any to any port = ftp dup-to 192.168.1.1@tun1000001 - [ Skip steps: i=end d=end p=5 sa=5 sp=end da=5 dp=5 ] + [ Skip steps: i=end r=end d=end p=5 sa=5 da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp dup-to fec0::1@tun1000001 - [ Skip steps: i=end d=end sp=end ] + [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=end p=7 sp=end dp=7 ] +@5 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA route-to tun1000001 + [ Skip steps: i=end r=end d=end p=7 sp=end dp=7 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state route-to tun1000001 - [ Skip steps: i=end d=end sp=end ] +@6 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA route-to tun1000001 + [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in on tun1000000 inet proto tcp from any to any port = ftp reply-to 192.168.1.1@tun1000001 - [ Skip steps: i=end d=end p=9 sa=9 sp=end da=9 dp=9 ] + [ Skip steps: i=end r=end d=end p=9 sa=9 da=9 sp=end dp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in on tun1000000 inet6 proto tcp from any to any port = ftp reply-to fec0::1@tun1000001 - [ Skip steps: i=end d=end sp=end ] + [ Skip steps: i=end r=end d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state reply-to tun1000001 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@9 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA reply-to tun1000001 + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state reply-to tun1000001 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@10 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA reply-to tun1000001 + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA keep state dup-to 192.168.1.100@tun1000001 - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@11 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA dup-to 192.168.1.100@tun1000001 + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA keep state dup-to fec1::2@tun1000001 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@12 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA dup-to fec1::2@tun1000001 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf14.loaded b/regress/sbin/pfctl/pf14.loaded index 43d0448bce9..d0343959bbc 100644 --- a/regress/sbin/pfctl/pf14.loaded +++ b/regress/sbin/pfctl/pf14.loaded @@ -1,24 +1,24 @@ -@0 pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=3 sp=end da=2 dp=end ] +@0 pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=3 da=2 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=3 sp=end dp=end ] +@1 pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@2 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA + [ Skip steps: i=end r=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 ] -@3 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@3 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA + [ Skip steps: i=end r=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 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@4 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA + [ Skip steps: i=end r=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 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@5 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf14.ok b/regress/sbin/pfctl/pf14.ok index 15cc43ff77c..a1fb43c3edc 100644 --- a/regress/sbin/pfctl/pf14.ok +++ b/regress/sbin/pfctl/pf14.ok @@ -1,6 +1,6 @@ -pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA keep state -pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA keep state -pass in quick on lo0 inet6 from fe80::1 to any flags S/SA keep state -pass in quick on lo0 inet6 from any to fe80::1 flags S/SA keep state -pass in quick on lo0 inet6 from fe80::1 to any flags S/SA keep state -pass in quick on lo0 inet6 from any to fe80::1 flags S/SA keep state +pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA +pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA +pass in quick on lo0 inet6 from fe80::1 to any flags S/SA +pass in quick on lo0 inet6 from any to fe80::1 flags S/SA +pass in quick on lo0 inet6 from fe80::1 to any flags S/SA +pass in quick on lo0 inet6 from any to fe80::1 flags S/SA diff --git a/regress/sbin/pfctl/pf14.optimized b/regress/sbin/pfctl/pf14.optimized index f18879251d3..0a5e1e6f6ff 100644 --- a/regress/sbin/pfctl/pf14.optimized +++ b/regress/sbin/pfctl/pf14.optimized @@ -1,8 +1,8 @@ -@0 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@0 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA + [ Skip steps: i=end r=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 ] -@1 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index 7604eb47a65..18c5e9b38a7 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -1,36 +1,36 @@ @0 match all scrub (no-df) - [ Skip steps: i=end d=5 f=end p=5 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match all scrub (min-ttl 25) - [ Skip steps: i=end d=5 f=end p=5 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match all scrub (max-mss 224) - [ Skip steps: i=end d=5 f=end p=5 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match all scrub (no-df max-mss 224) - [ Skip steps: i=end d=5 f=end p=5 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match all scrub (set-tos 0x10) - [ Skip steps: i=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match out proto esp all scrub (set-tos 0x08) - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match out proto ah all scrub (set-tos 0x04) - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match out proto icmp all scrub (set-tos 0x12) - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match out all scrub (set-tos 0x08) tagged THROUGHPUT - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf15.optimized b/regress/sbin/pfctl/pf15.optimized index 6b2db1c038a..58fbab0fe36 100644 --- a/regress/sbin/pfctl/pf15.optimized +++ b/regress/sbin/pfctl/pf15.optimized @@ -1,20 +1,20 @@ @0 match all scrub (no-df) - [ Skip steps: i=end d=4 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=4 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match all scrub (min-ttl 25) - [ Skip steps: i=end d=4 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=4 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match all scrub (no-df max-mss 224) - [ Skip steps: i=end d=4 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=4 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match all scrub (set-tos 0x10) - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out all scrub (set-tos 0x08) tagged THROUGHPUT - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf16.loaded b/regress/sbin/pfctl/pf16.loaded index 3f8f6e88ab8..542a55b76d7 100644 --- a/regress/sbin/pfctl/pf16.loaded +++ b/regress/sbin/pfctl/pf16.loaded @@ -1,20 +1,20 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 - [ Skip steps: i=4 f=4 sp=end ] + [ Skip steps: i=4 d=end f=4 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22 - [ Skip steps: i=4 f=4 sp=end ] + [ Skip steps: i=4 d=end f=4 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 static-port - [ Skip steps: i=4 f=4 p=end sp=end dp=end ] + [ Skip steps: i=4 d=end f=4 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match in on lo0 inet from any to 10.0.0.1 rdr-to 192.168.1.1 - [ Skip steps: d=end p=end sa=end sp=end dp=end ] + [ Skip steps: r=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in on lo1000000 all no state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf16.optimized b/regress/sbin/pfctl/pf16.optimized index 3f8f6e88ab8..542a55b76d7 100644 --- a/regress/sbin/pfctl/pf16.optimized +++ b/regress/sbin/pfctl/pf16.optimized @@ -1,20 +1,20 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 - [ Skip steps: i=4 f=4 sp=end ] + [ Skip steps: i=4 d=end f=4 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22 - [ Skip steps: i=4 f=4 sp=end ] + [ Skip steps: i=4 d=end f=4 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 static-port - [ Skip steps: i=4 f=4 p=end sp=end dp=end ] + [ Skip steps: i=4 d=end f=4 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match in on lo0 inet from any to 10.0.0.1 rdr-to 192.168.1.1 - [ Skip steps: d=end p=end sa=end sp=end dp=end ] + [ Skip steps: r=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in on lo1000000 all no state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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.loaded b/regress/sbin/pfctl/pf17.loaded index f541e3978cf..c928653fe74 100644 --- a/regress/sbin/pfctl/pf17.loaded +++ b/regress/sbin/pfctl/pf17.loaded @@ -1,344 +1,344 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 static-port - [ Skip steps: i=82 f=40 p=2 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=2 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet from any to 10.0.0.1 rdr-to 192.168.1.1 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 static-port - [ Skip steps: i=82 f=40 p=4 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match in on lo0 inet proto tcp from any to 10.0.0.2 rdr-to 192.168.1.2 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 static-port - [ Skip steps: i=82 f=40 p=6 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in on lo0 inet proto udp from any to 10.0.0.3 rdr-to 192.168.1.3 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match out on lo0 inet proto icmp from 192.168.1.4 to any nat-to 10.0.0.4 static-port - [ Skip steps: i=82 f=40 p=8 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match in on lo0 inet proto icmp from any to 10.0.0.4 rdr-to 192.168.1.4 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match out on lo0 inet from 192.168.1.5 to 172.16.1.1 nat-to 10.0.0.5 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in on lo0 inet from 172.16.1.1 to 10.0.0.5 rdr-to 192.168.1.5 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 match out on lo0 inet from 192.168.1.6 to 172.16.1.2 nat-to 10.0.0.6 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match in on lo0 inet from 172.16.1.2 to 10.0.0.6 rdr-to 192.168.1.6 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match out on lo0 inet from 192.168.1.7 to 172.16.2.0/24 nat-to 10.0.0.7 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match in on lo0 inet from 172.16.2.0/24 to 10.0.0.7 rdr-to 192.168.1.7 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out on lo0 inet from 192.168.2.0/24 to any nat-to 10.0.5.0/24 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 match in on lo0 inet from any to 10.0.5.0/24 rdr-to 192.168.2.0/24 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 match out on lo0 inet from 192.168.2.0/28 to any nat-to 10.0.4.0/28 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 match in on lo0 inet from any to 10.0.4.0/28 rdr-to 192.168.2.0/28 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 match out on lo0 inet from 192.168.2.0/30 to 192.168.3.1 nat-to 10.0.3.0/30 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 match in on lo0 inet from 192.168.3.1 to 10.0.3.0/30 rdr-to 192.168.2.0/30 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 match out on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 match in on lo0 inet from ! 172.17.0.0/16 to 10.0.0.8 rdr-to 192.168.1.8 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 match out on lo0 inet from 1.1.1.1 to no-route nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 match in on lo0 inet from no-route to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 match out on lo0 inet from (lo0:0:1) to 1.1.1.1 nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 match in on lo0 inet from 1.1.1.1 to 2.2.2.2 rdr-to (lo0:0:1) - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 match out on lo0 inet from (lo0:0:1) to 1.1.1.1 nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 match in on lo0 inet from 1.1.1.1 to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=40 p=end sp=end da=30 dp=end ] + [ Skip steps: i=82 d=end f=40 p=end da=30 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 match out on lo0 inet from (lo0:0:1) to (lo1000000:0:*) nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=40 p=end sp=end da=30 dp=end ] + [ Skip steps: i=82 d=end f=40 p=end da=30 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 match in on lo0 inet from (lo1000000:0:*) to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @30 match out on lo0 inet from 1.1.1.1 to <sometable:*> nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @31 match in on lo0 inet from <sometable:*> to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @32 match out on lo0 inet from 1.1.1.1 to ! <sometable:*> nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @33 match in on lo0 inet from ! <sometable:*> to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @34 match out on lo0 inet from 1.1.1.1 to (lo1000000:0:*) nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @35 match in on lo0 inet from (lo1000000:0:*) to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @36 match out on lo0 inet from 1.1.1.1 to ! (lo1000000:0:*) nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @37 match in on lo0 inet from ! (lo1000000:0:*) to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @38 match out on lo0 inet from (lo0:0:1) to <sometable:*> nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @39 match in on lo0 inet from <sometable:*> to 2.2.2.2 rdr-to (lo0:0:1) - [ Skip steps: i=82 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @40 match out on lo0 inet6 from ::1 to no-route nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @41 match in on lo0 inet6 from no-route to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 match out on lo0 inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @43 match in on lo0 inet6 from ::1 to ::2 rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @44 match out on lo0 inet6 from (lo0:0:1) to ::1 nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @45 match in on lo0 inet6 from ::1 to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end da=48 dp=end ] + [ Skip steps: i=82 d=end f=end p=end da=48 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @46 match out on lo0 inet6 from (lo0:0:1) to (lo1000000:0:*) nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=end p=end sp=end da=48 dp=end ] + [ Skip steps: i=82 d=end f=end p=end da=48 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @47 match in on lo0 inet6 from (lo1000000:0:*) to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @48 match out on lo0 inet6 from ::1 to <sometable:*> nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @49 match in on lo0 inet6 from <sometable:*> to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @50 match out on lo0 inet6 from ::1 to ! <sometable:*> nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @51 match in on lo0 inet6 from ! <sometable:*> to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @52 match out on lo0 inet6 from ::1 to (lo1000000:0:*) nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @53 match in on lo0 inet6 from (lo1000000:0:*) to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @54 match out on lo0 inet6 from ::1 to ! (lo1000000:0:*) nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @55 match in on lo0 inet6 from ! (lo1000000:0:*) to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @56 match out on lo0 inet6 from (lo0:0:1) to <sometable:*> nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @57 match in on lo0 inet6 from <sometable:*> to ::2 rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @58 match out on lo0 inet6 from ::1 to (lo0:2) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @59 match in on lo0 inet6 from (lo0:2) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @60 match out on lo0 inet6 from ::1 to (lo0:0:1) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @61 match in on lo0 inet6 from (lo0:0:1) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @62 match out on lo0 inet6 from ::1 to (lo0:peer:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @63 match in on lo0 inet6 from (lo0:peer:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @64 match out on lo0 inet6 from ::1 to (lo0:peer:0:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @65 match in on lo0 inet6 from (lo0:peer:0:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @66 match out on lo0 inet6 from ::1 to (lo0:broadcast:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @67 match in on lo0 inet6 from (lo0:broadcast:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @68 match out on lo0 inet6 from ::1 to (lo0:broadcast:0:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @69 match in on lo0 inet6 from (lo0:broadcast:0:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @70 match out on lo0 inet6 from ::1 to (lo0:network:1) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @71 match in on lo0 inet6 from (lo0:network:1) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @72 match out on lo0 inet6 from ::1 to (lo0:network:0:1) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @73 match in on lo0 inet6 from (lo0:network:0:1) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @74 match out on lo0 inet6 from ::1 to (lo0:2)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @75 match in on lo0 inet6 from (lo0:2)/100 to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @76 match out on lo0 inet6 from ::1 to (lo0:0:1)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @77 match in on lo0 inet6 from (lo0:0:1)/100 to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @78 match out on lo0 inet6 from ::1 to (lo0:peer:*)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @79 match in on lo0 inet6 from (lo0:peer:*)/100 to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @80 match out on lo0 inet6 from ::1 to (lo0:peer:0:*)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @81 match in on lo0 inet6 from (lo0:peer:0:*)/100 to ::2 rdr-to ::1 - [ Skip steps: f=end p=end sp=end dp=end ] + [ 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 ] @82 match out on lo inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port - [ Skip steps: i=84 f=end p=end sp=end dp=end ] + [ Skip steps: i=84 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 ] @83 match in on lo inet6 from ::1 to ::2 rdr-to (lo0:0:1) - [ Skip steps: f=end p=end sp=end dp=end ] + [ 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 ] @84 match out on tun inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @85 match in on tun inet6 from ::1 to ::2 rdr-to (lo0:0:1) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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.optimized b/regress/sbin/pfctl/pf17.optimized index f541e3978cf..c928653fe74 100644 --- a/regress/sbin/pfctl/pf17.optimized +++ b/regress/sbin/pfctl/pf17.optimized @@ -1,344 +1,344 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 static-port - [ Skip steps: i=82 f=40 p=2 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=2 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet from any to 10.0.0.1 rdr-to 192.168.1.1 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 static-port - [ Skip steps: i=82 f=40 p=4 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match in on lo0 inet proto tcp from any to 10.0.0.2 rdr-to 192.168.1.2 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 static-port - [ Skip steps: i=82 f=40 p=6 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in on lo0 inet proto udp from any to 10.0.0.3 rdr-to 192.168.1.3 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match out on lo0 inet proto icmp from 192.168.1.4 to any nat-to 10.0.0.4 static-port - [ Skip steps: i=82 f=40 p=8 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match in on lo0 inet proto icmp from any to 10.0.0.4 rdr-to 192.168.1.4 - [ Skip steps: i=82 f=40 sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match out on lo0 inet from 192.168.1.5 to 172.16.1.1 nat-to 10.0.0.5 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in on lo0 inet from 172.16.1.1 to 10.0.0.5 rdr-to 192.168.1.5 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 match out on lo0 inet from 192.168.1.6 to 172.16.1.2 nat-to 10.0.0.6 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match in on lo0 inet from 172.16.1.2 to 10.0.0.6 rdr-to 192.168.1.6 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match out on lo0 inet from 192.168.1.7 to 172.16.2.0/24 nat-to 10.0.0.7 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match in on lo0 inet from 172.16.2.0/24 to 10.0.0.7 rdr-to 192.168.1.7 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out on lo0 inet from 192.168.2.0/24 to any nat-to 10.0.5.0/24 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 match in on lo0 inet from any to 10.0.5.0/24 rdr-to 192.168.2.0/24 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 match out on lo0 inet from 192.168.2.0/28 to any nat-to 10.0.4.0/28 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 match in on lo0 inet from any to 10.0.4.0/28 rdr-to 192.168.2.0/28 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 match out on lo0 inet from 192.168.2.0/30 to 192.168.3.1 nat-to 10.0.3.0/30 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 match in on lo0 inet from 192.168.3.1 to 10.0.3.0/30 rdr-to 192.168.2.0/30 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 match out on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 match in on lo0 inet from ! 172.17.0.0/16 to 10.0.0.8 rdr-to 192.168.1.8 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 match out on lo0 inet from 1.1.1.1 to no-route nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 match in on lo0 inet from no-route to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 match out on lo0 inet from (lo0:0:1) to 1.1.1.1 nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 match in on lo0 inet from 1.1.1.1 to 2.2.2.2 rdr-to (lo0:0:1) - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 match out on lo0 inet from (lo0:0:1) to 1.1.1.1 nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 match in on lo0 inet from 1.1.1.1 to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=40 p=end sp=end da=30 dp=end ] + [ Skip steps: i=82 d=end f=40 p=end da=30 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 match out on lo0 inet from (lo0:0:1) to (lo1000000:0:*) nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=40 p=end sp=end da=30 dp=end ] + [ Skip steps: i=82 d=end f=40 p=end da=30 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 match in on lo0 inet from (lo1000000:0:*) to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @30 match out on lo0 inet from 1.1.1.1 to <sometable:*> nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @31 match in on lo0 inet from <sometable:*> to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @32 match out on lo0 inet from 1.1.1.1 to ! <sometable:*> nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @33 match in on lo0 inet from ! <sometable:*> to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @34 match out on lo0 inet from 1.1.1.1 to (lo1000000:0:*) nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @35 match in on lo0 inet from (lo1000000:0:*) to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @36 match out on lo0 inet from 1.1.1.1 to ! (lo1000000:0:*) nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @37 match in on lo0 inet from ! (lo1000000:0:*) to 2.2.2.2 rdr-to 1.1.1.1 - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @38 match out on lo0 inet from (lo0:0:1) to <sometable:*> nat-to 2.2.2.2 static-port - [ Skip steps: i=82 f=40 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @39 match in on lo0 inet from <sometable:*> to 2.2.2.2 rdr-to (lo0:0:1) - [ Skip steps: i=82 p=end sp=end dp=end ] + [ Skip steps: i=82 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @40 match out on lo0 inet6 from ::1 to no-route nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @41 match in on lo0 inet6 from no-route to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 match out on lo0 inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @43 match in on lo0 inet6 from ::1 to ::2 rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @44 match out on lo0 inet6 from (lo0:0:1) to ::1 nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @45 match in on lo0 inet6 from ::1 to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end da=48 dp=end ] + [ Skip steps: i=82 d=end f=end p=end da=48 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @46 match out on lo0 inet6 from (lo0:0:1) to (lo1000000:0:*) nat-to (lo1000000:0:*) static-port - [ Skip steps: i=82 f=end p=end sp=end da=48 dp=end ] + [ Skip steps: i=82 d=end f=end p=end da=48 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @47 match in on lo0 inet6 from (lo1000000:0:*) to (lo1000000:0:*) rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @48 match out on lo0 inet6 from ::1 to <sometable:*> nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @49 match in on lo0 inet6 from <sometable:*> to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @50 match out on lo0 inet6 from ::1 to ! <sometable:*> nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @51 match in on lo0 inet6 from ! <sometable:*> to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @52 match out on lo0 inet6 from ::1 to (lo1000000:0:*) nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @53 match in on lo0 inet6 from (lo1000000:0:*) to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @54 match out on lo0 inet6 from ::1 to ! (lo1000000:0:*) nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @55 match in on lo0 inet6 from ! (lo1000000:0:*) to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @56 match out on lo0 inet6 from (lo0:0:1) to <sometable:*> nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @57 match in on lo0 inet6 from <sometable:*> to ::2 rdr-to (lo0:0:1) - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @58 match out on lo0 inet6 from ::1 to (lo0:2) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @59 match in on lo0 inet6 from (lo0:2) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @60 match out on lo0 inet6 from ::1 to (lo0:0:1) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @61 match in on lo0 inet6 from (lo0:0:1) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @62 match out on lo0 inet6 from ::1 to (lo0:peer:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @63 match in on lo0 inet6 from (lo0:peer:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @64 match out on lo0 inet6 from ::1 to (lo0:peer:0:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @65 match in on lo0 inet6 from (lo0:peer:0:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @66 match out on lo0 inet6 from ::1 to (lo0:broadcast:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @67 match in on lo0 inet6 from (lo0:broadcast:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @68 match out on lo0 inet6 from ::1 to (lo0:broadcast:0:*) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @69 match in on lo0 inet6 from (lo0:broadcast:0:*) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @70 match out on lo0 inet6 from ::1 to (lo0:network:1) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @71 match in on lo0 inet6 from (lo0:network:1) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @72 match out on lo0 inet6 from ::1 to (lo0:network:0:1) nat-to ::1 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @73 match in on lo0 inet6 from (lo0:network:0:1) to ::1 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @74 match out on lo0 inet6 from ::1 to (lo0:2)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @75 match in on lo0 inet6 from (lo0:2)/100 to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @76 match out on lo0 inet6 from ::1 to (lo0:0:1)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @77 match in on lo0 inet6 from (lo0:0:1)/100 to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @78 match out on lo0 inet6 from ::1 to (lo0:peer:*)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @79 match in on lo0 inet6 from (lo0:peer:*)/100 to ::2 rdr-to ::1 - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @80 match out on lo0 inet6 from ::1 to (lo0:peer:0:*)/100 nat-to ::2 static-port - [ Skip steps: i=82 f=end p=end sp=end dp=end ] + [ Skip steps: i=82 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 ] @81 match in on lo0 inet6 from (lo0:peer:0:*)/100 to ::2 rdr-to ::1 - [ Skip steps: f=end p=end sp=end dp=end ] + [ 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 ] @82 match out on lo inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port - [ Skip steps: i=84 f=end p=end sp=end dp=end ] + [ Skip steps: i=84 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 ] @83 match in on lo inet6 from ::1 to ::2 rdr-to (lo0:0:1) - [ Skip steps: f=end p=end sp=end dp=end ] + [ 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 ] @84 match out on tun inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @85 match in on tun inet6 from ::1 to ::2 rdr-to (lo0:0:1) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf18.loaded b/regress/sbin/pfctl/pf18.loaded index 83c6f7f54fb..aa9e6660de4 100644 --- a/regress/sbin/pfctl/pf18.loaded +++ b/regress/sbin/pfctl/pf18.loaded @@ -1,76 +1,76 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 - [ Skip steps: i=15 d=end f=end sp=end da=4 dp=end ] + [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 - [ Skip steps: i=15 d=end f=end sp=end da=4 dp=end ] + [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 - [ Skip steps: i=15 d=end f=end sp=end da=4 dp=end ] + [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet proto icmp from 192.168.1.4 to any nat-to 10.0.0.4 - [ Skip steps: i=15 d=end f=end sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out on lo0 inet from 192.168.1.5 to 172.6.1.1 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=7 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match out on lo0 inet from 192.168.1.5 to 172.14.1.2 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=7 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match out on lo0 inet from 192.168.1.5 to 172.16.2.0/24 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match out on lo0 inet from 192.168.1.6 to 172.6.1.1 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=10 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match out on lo0 inet from 192.168.1.6 to 172.14.1.2 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=10 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match out on lo0 inet from 192.168.1.6 to 172.16.2.0/24 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 match out on lo0 inet from 192.168.1.7 to 172.6.1.1 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=13 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=13 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match out on lo0 inet from 192.168.1.7 to 172.14.1.2 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=13 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=13 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match out on lo0 inet from 192.168.1.7 to 172.16.2.0/24 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match out on lo0 inet from 192.168.0.0/24 to any nat-to (lo0:1) round-robin - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8 - [ Skip steps: d=end f=end sp=end dp=end ] + [ Skip steps: r=end f=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 match out on ! lo0 inet proto udp all nat-to 10.0.0.8 static-port - [ Skip steps: i=17 d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=17 r=end d=17 f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 match out on ! lo0 inet proto tcp all nat-to 10.0.0.8 static-port - [ Skip steps: d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 match out on lo0 inet all nat-to 10.0.0.8 - [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 match out on tun1000000 inet all nat-to 10.0.0.8 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf18.optimized b/regress/sbin/pfctl/pf18.optimized index 83c6f7f54fb..aa9e6660de4 100644 --- a/regress/sbin/pfctl/pf18.optimized +++ b/regress/sbin/pfctl/pf18.optimized @@ -1,76 +1,76 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 - [ Skip steps: i=15 d=end f=end sp=end da=4 dp=end ] + [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 - [ Skip steps: i=15 d=end f=end sp=end da=4 dp=end ] + [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 - [ Skip steps: i=15 d=end f=end sp=end da=4 dp=end ] + [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet proto icmp from 192.168.1.4 to any nat-to 10.0.0.4 - [ Skip steps: i=15 d=end f=end sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out on lo0 inet from 192.168.1.5 to 172.6.1.1 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=7 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match out on lo0 inet from 192.168.1.5 to 172.14.1.2 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=7 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match out on lo0 inet from 192.168.1.5 to 172.16.2.0/24 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match out on lo0 inet from 192.168.1.6 to 172.6.1.1 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=10 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match out on lo0 inet from 192.168.1.6 to 172.14.1.2 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=10 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match out on lo0 inet from 192.168.1.6 to 172.16.2.0/24 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 match out on lo0 inet from 192.168.1.7 to 172.6.1.1 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=13 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=13 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match out on lo0 inet from 192.168.1.7 to 172.14.1.2 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sa=13 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sa=13 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match out on lo0 inet from 192.168.1.7 to 172.16.2.0/24 nat-to 127.0.0.1 - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match out on lo0 inet from 192.168.0.0/24 to any nat-to (lo0:1) round-robin - [ Skip steps: i=15 d=end f=end p=15 sp=end dp=end ] + [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8 - [ Skip steps: d=end f=end sp=end dp=end ] + [ Skip steps: r=end f=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 match out on ! lo0 inet proto udp all nat-to 10.0.0.8 static-port - [ Skip steps: i=17 d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=17 r=end d=17 f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 match out on ! lo0 inet proto tcp all nat-to 10.0.0.8 static-port - [ Skip steps: d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 match out on lo0 inet all nat-to 10.0.0.8 - [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 match out on tun1000000 inet all nat-to 10.0.0.8 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf19.loaded b/regress/sbin/pfctl/pf19.loaded index 07d401a7d6f..45dacd3672f 100644 --- a/regress/sbin/pfctl/pf19.loaded +++ b/regress/sbin/pfctl/pf19.loaded @@ -1,36 +1,36 @@ @0 match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22 - [ Skip steps: i=5 d=end f=end p=end sp=end ] + [ Skip steps: i=5 r=end d=end f=end p=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=5 d=end f=end p=end sa=3 sp=end dp=end ] + [ Skip steps: i=5 r=end d=end f=end p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=5 d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=5 r=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 ] @3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=5 d=end f=end p=end sa=5 sp=end dp=end ] + [ Skip steps: i=5 r=end d=end f=end p=end sa=5 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: d=end f=end p=end sp=end dp=end ] + [ Skip steps: r=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 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=7 sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @7 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf19.optimized b/regress/sbin/pfctl/pf19.optimized index 07d401a7d6f..45dacd3672f 100644 --- a/regress/sbin/pfctl/pf19.optimized +++ b/regress/sbin/pfctl/pf19.optimized @@ -1,36 +1,36 @@ @0 match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22 - [ Skip steps: i=5 d=end f=end p=end sp=end ] + [ Skip steps: i=5 r=end d=end f=end p=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=5 d=end f=end p=end sa=3 sp=end dp=end ] + [ Skip steps: i=5 r=end d=end f=end p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=5 d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=5 r=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 ] @3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=5 d=end f=end p=end sa=5 sp=end dp=end ] + [ Skip steps: i=5 r=end d=end f=end p=end sa=5 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: d=end f=end p=end sp=end dp=end ] + [ Skip steps: r=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 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=7 sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @7 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf2.loaded b/regress/sbin/pfctl/pf2.loaded index 967e5d83ab6..0f53321d398 100644 --- a/regress/sbin/pfctl/pf2.loaded +++ b/regress/sbin/pfctl/pf2.loaded @@ -1,88 +1,88 @@ @0 block drop out log on tun1000000 all - [ Skip steps: i=12 f=6 p=2 sa=6 sp=end da=7 dp=16 ] + [ Skip steps: i=12 d=end f=6 p=2 sa=6 da=7 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log on tun1000000 all - [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ] + [ Skip steps: i=12 d=end f=6 sa=6 da=7 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst out log on tun1000000 proto tcp all - [ Skip steps: i=12 f=6 p=4 sa=6 sp=end da=7 dp=16 ] + [ Skip steps: i=12 d=end f=6 p=4 sa=6 da=7 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block return-rst in log on tun1000000 proto tcp all - [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ] + [ Skip steps: i=12 d=end f=6 sa=6 da=7 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all - [ Skip steps: i=12 f=6 p=6 sa=6 sp=end da=7 dp=16 ] + [ Skip steps: i=12 d=end f=6 p=6 sa=6 da=7 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all - [ Skip steps: i=12 sp=end da=7 dp=16 ] + [ Skip steps: i=12 d=end da=7 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any - [ Skip steps: i=12 f=12 p=13 sp=end dp=16 ] + [ Skip steps: i=12 d=end f=12 p=13 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in quick on tun1000000 inet from any to 255.255.255.255 - [ Skip steps: i=12 d=13 f=12 p=13 sp=end dp=16 ] + [ Skip steps: i=12 r=13 d=end f=12 p=13 sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any - [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] + [ Skip steps: i=12 r=13 d=end f=12 p=13 da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any - [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] + [ Skip steps: i=12 r=13 d=end f=12 p=13 da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any - [ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] + [ Skip steps: i=12 r=13 d=end f=12 p=13 da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any - [ Skip steps: d=13 p=13 sp=end da=end dp=16 ] + [ Skip steps: r=13 d=end p=13 da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in log quick from no-route to any - [ Skip steps: sp=end da=end dp=16 ] + [ Skip steps: d=end da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end f=15 p=15 sa=end sp=end da=end dp=16 ] +@13 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end d=end f=15 p=15 sa=end da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end sa=end sp=end da=end dp=16 ] +@14 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end d=end sa=end da=end sp=end dp=16 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass out on tun1000000 proto udp all keep state - [ Skip steps: i=end f=end p=17 sa=end sp=end da=end ] +@15 pass out on tun1000000 proto udp all + [ Skip steps: i=end d=end f=end p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in on tun1000000 proto udp from any to any port = domain keep state - [ Skip steps: i=end f=end sa=end sp=end da=end ] +@16 pass in on tun1000000 proto udp from any to any port = domain + [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass out on tun1000000 proto tcp all flags S/SA keep state - [ Skip steps: i=end f=end p=end sa=end sp=end da=end ] +@17 pass out on tun1000000 proto tcp all flags S/SA + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@18 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@19 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@20 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@21 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf2.ok b/regress/sbin/pfctl/pf2.ok index 02e3099013e..66f2b1d34c1 100644 --- a/regress/sbin/pfctl/pf2.ok +++ b/regress/sbin/pfctl/pf2.ok @@ -11,12 +11,12 @@ block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any block drop in log quick on tun1000000 inet from 255.255.255.255 to any block drop in log quick from no-route to any -pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state -pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state -pass out on tun1000000 proto udp all keep state -pass in on tun1000000 proto udp from any to any port = domain keep state -pass out on tun1000000 proto tcp all flags S/SA keep state -pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA keep state -pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA keep state -pass in on tun1000000 proto tcp from any to any port = domain flags S/SA keep state -pass in on tun1000000 proto tcp from any to any port = auth flags S/SA keep state +pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 +pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 +pass out on tun1000000 proto udp all +pass in on tun1000000 proto udp from any to any port = domain +pass out on tun1000000 proto tcp all flags S/SA +pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA +pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA +pass in on tun1000000 proto tcp from any to any port = domain flags S/SA +pass in on tun1000000 proto tcp from any to any port = auth flags S/SA diff --git a/regress/sbin/pfctl/pf2.optimized b/regress/sbin/pfctl/pf2.optimized index 1742eb3715a..d60889f3e0b 100644 --- a/regress/sbin/pfctl/pf2.optimized +++ b/regress/sbin/pfctl/pf2.optimized @@ -1,88 +1,88 @@ @0 block drop out log on tun1000000 all - [ Skip steps: i=12 f=6 p=2 sa=6 sp=end da=7 dp=13 ] + [ Skip steps: i=12 d=end f=6 p=2 sa=6 da=7 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log on tun1000000 all - [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=13 ] + [ Skip steps: i=12 d=end f=6 sa=6 da=7 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst out log on tun1000000 proto tcp all - [ Skip steps: i=12 f=6 p=4 sa=6 sp=end da=7 dp=13 ] + [ Skip steps: i=12 d=end f=6 p=4 sa=6 da=7 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block return-rst in log on tun1000000 proto tcp all - [ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=13 ] + [ Skip steps: i=12 d=end f=6 sa=6 da=7 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all - [ Skip steps: i=12 f=6 p=6 sa=6 sp=end da=7 dp=13 ] + [ Skip steps: i=12 d=end f=6 p=6 sa=6 da=7 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all - [ Skip steps: i=12 sp=end da=7 dp=13 ] + [ Skip steps: i=12 d=end da=7 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any - [ Skip steps: i=12 f=12 p=13 sp=end dp=13 ] + [ Skip steps: i=12 d=end f=12 p=13 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in quick on tun1000000 inet from any to 255.255.255.255 - [ Skip steps: i=12 d=19 f=12 p=13 sp=end dp=13 ] + [ Skip steps: i=12 r=19 d=end f=12 p=13 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any - [ Skip steps: i=12 d=19 f=12 p=13 sp=end da=end dp=13 ] + [ Skip steps: i=12 r=19 d=end f=12 p=13 da=end sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any - [ Skip steps: i=12 d=19 f=12 p=13 sp=end da=end dp=13 ] + [ Skip steps: i=12 r=19 d=end f=12 p=13 da=end sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any - [ Skip steps: i=12 d=19 f=12 p=13 sp=end da=end dp=13 ] + [ Skip steps: i=12 r=19 d=end f=12 p=13 da=end sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any - [ Skip steps: d=19 p=13 sp=end da=end dp=13 ] + [ Skip steps: r=19 d=end p=13 da=end sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in log quick from no-route to any - [ Skip steps: d=19 f=17 sp=end da=end ] + [ Skip steps: r=19 d=end f=17 da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA keep state - [ Skip steps: i=end d=19 f=17 p=17 sa=end sp=end da=end ] +@13 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA + [ Skip steps: i=end r=19 d=end f=17 p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA keep state - [ Skip steps: i=end d=19 f=17 p=17 sa=end sp=end da=end ] +@14 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA + [ Skip steps: i=end r=19 d=end f=17 p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA keep state - [ Skip steps: i=end d=19 f=17 p=17 sa=end sp=end da=end ] +@15 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA + [ Skip steps: i=end r=19 d=end f=17 p=17 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA keep state - [ Skip steps: i=end d=19 sa=end sp=end da=end ] +@16 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA + [ Skip steps: i=end r=19 d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end d=19 sa=end sp=end da=end ] +@17 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end r=19 d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun1000000 proto udp from any to any port = domain keep state - [ Skip steps: i=end sa=end sp=end da=end ] +@18 pass in on tun1000000 proto udp from any to any port = domain + [ Skip steps: i=end d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] +@19 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass out on tun1000000 proto udp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@20 pass out on tun1000000 proto udp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass out on tun1000000 proto tcp all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@21 pass out on tun1000000 proto tcp all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf20.loaded b/regress/sbin/pfctl/pf20.loaded index f60ab43e25b..b073d2c3ae6 100644 --- a/regress/sbin/pfctl/pf20.loaded +++ b/regress/sbin/pfctl/pf20.loaded @@ -1,48 +1,48 @@ @0 match out on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 nat-to 127.0.0.1 - [ Skip steps: i=8 d=4 f=end p=4 sa=2 sp=end dp=4 ] + [ Skip steps: i=8 r=4 d=end f=end p=4 sa=2 sp=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 nat-to 127.0.0.1 - [ Skip steps: i=8 d=4 f=end p=4 sp=end dp=4 ] + [ Skip steps: i=8 r=4 d=end f=end p=4 sp=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet from 10.0.1.0/24 to 1.2.3.0/25 nat-to 127.0.0.1 - [ Skip steps: i=8 d=4 f=end p=4 sa=4 sp=end dp=4 ] + [ Skip steps: i=8 r=4 d=end f=end p=4 sa=4 sp=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 nat-to 127.0.0.1 - [ Skip steps: i=8 f=end sp=end ] + [ Skip steps: i=8 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=8 d=end f=end p=end sa=6 sp=end dp=end ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=8 d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=8 r=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 ] @6 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=8 d=end f=end p=end sa=8 sp=end dp=end ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: d=end f=end p=end sp=end dp=end ] + [ Skip steps: r=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 ] @8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=10 sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf20.optimized b/regress/sbin/pfctl/pf20.optimized index f60ab43e25b..b073d2c3ae6 100644 --- a/regress/sbin/pfctl/pf20.optimized +++ b/regress/sbin/pfctl/pf20.optimized @@ -1,48 +1,48 @@ @0 match out on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 nat-to 127.0.0.1 - [ Skip steps: i=8 d=4 f=end p=4 sa=2 sp=end dp=4 ] + [ Skip steps: i=8 r=4 d=end f=end p=4 sa=2 sp=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 nat-to 127.0.0.1 - [ Skip steps: i=8 d=4 f=end p=4 sp=end dp=4 ] + [ Skip steps: i=8 r=4 d=end f=end p=4 sp=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet from 10.0.1.0/24 to 1.2.3.0/25 nat-to 127.0.0.1 - [ Skip steps: i=8 d=4 f=end p=4 sa=4 sp=end dp=4 ] + [ Skip steps: i=8 r=4 d=end f=end p=4 sa=4 sp=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 nat-to 127.0.0.1 - [ Skip steps: i=8 f=end sp=end ] + [ Skip steps: i=8 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=8 d=end f=end p=end sa=6 sp=end dp=end ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=8 d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=8 r=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 ] @6 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=8 d=end f=end p=end sa=8 sp=end dp=end ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: d=end f=end p=end sp=end dp=end ] + [ Skip steps: r=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 ] @8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=10 sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = ftp rdr-to 127.0.0.1 port 8021 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf23.loaded b/regress/sbin/pfctl/pf23.loaded index d6033524ed6..8a0d52b7f22 100644 --- a/regress/sbin/pfctl/pf23.loaded +++ b/regress/sbin/pfctl/pf23.loaded @@ -1,4 +1,4 @@ @0 block drop in on ! lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf23.optimized b/regress/sbin/pfctl/pf23.optimized index d6033524ed6..8a0d52b7f22 100644 --- a/regress/sbin/pfctl/pf23.optimized +++ b/regress/sbin/pfctl/pf23.optimized @@ -1,4 +1,4 @@ @0 block drop in on ! lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf24.loaded b/regress/sbin/pfctl/pf24.loaded index d92f7f50198..f032f59eac4 100644 --- a/regress/sbin/pfctl/pf24.loaded +++ b/regress/sbin/pfctl/pf24.loaded @@ -1,8 +1,8 @@ -@0 pass in proto tcp from any to any port = ssh flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@0 pass in proto tcp from any to any port = ssh flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = ftp flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in proto tcp from any to any port = ftp flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf24.ok b/regress/sbin/pfctl/pf24.ok index c6ff2f03701..01f21d476f8 100644 --- a/regress/sbin/pfctl/pf24.ok +++ b/regress/sbin/pfctl/pf24.ok @@ -3,5 +3,5 @@ b = "ftp" c = "ssh ftp" d = "ssh ftp ssh ftp" e = "ssh ftp ftp test ssh ftp" -pass in proto tcp from any to any port = ssh flags S/SA keep state -pass in proto tcp from any to any port = ftp flags S/SA keep state +pass in proto tcp from any to any port = ssh flags S/SA +pass in proto tcp from any to any port = ftp flags S/SA diff --git a/regress/sbin/pfctl/pf24.optimized b/regress/sbin/pfctl/pf24.optimized index d92f7f50198..f032f59eac4 100644 --- a/regress/sbin/pfctl/pf24.optimized +++ b/regress/sbin/pfctl/pf24.optimized @@ -1,8 +1,8 @@ -@0 pass in proto tcp from any to any port = ssh flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@0 pass in proto tcp from any to any port = ssh flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = ftp flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in proto tcp from any to any port = ftp flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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.loaded b/regress/sbin/pfctl/pf25.loaded index 37180adfd2d..e78e2b7fa48 100644 --- a/regress/sbin/pfctl/pf25.loaded +++ b/regress/sbin/pfctl/pf25.loaded @@ -1,20 +1,20 @@ -@0 block drop in on ! lo0 inet from 127.0.0.0/8 to any - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@0 block drop in on ! lo0 inet6 from ::1 to any + [ Skip steps: i=end r=end d=end p=end da=end sp=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=end d=end p=end sp=end da=end dp=end ] +@1 block drop in on ! lo0 inet from 127.0.0.0/8 to any + [ Skip steps: i=end r=end d=end f=3 p=end sa=3 da=end sp=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=end d=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end da=end sp=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=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=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: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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.ok b/regress/sbin/pfctl/pf25.ok index 17cb83ec1bf..f4fc7766dc0 100644 --- a/regress/sbin/pfctl/pf25.ok +++ b/regress/sbin/pfctl/pf25.ok @@ -1,5 +1,5 @@ -block drop in on ! lo0 inet from 127.0.0.0/8 to any block drop in on ! lo0 inet6 from ::1 to any +block drop in on ! lo0 inet from 127.0.0.0/8 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 diff --git a/regress/sbin/pfctl/pf25.optimized b/regress/sbin/pfctl/pf25.optimized index 37180adfd2d..e78e2b7fa48 100644 --- a/regress/sbin/pfctl/pf25.optimized +++ b/regress/sbin/pfctl/pf25.optimized @@ -1,20 +1,20 @@ -@0 block drop in on ! lo0 inet from 127.0.0.0/8 to any - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@0 block drop in on ! lo0 inet6 from ::1 to any + [ Skip steps: i=end r=end d=end p=end da=end sp=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=end d=end p=end sp=end da=end dp=end ] +@1 block drop in on ! lo0 inet from 127.0.0.0/8 to any + [ Skip steps: i=end r=end d=end f=3 p=end sa=3 da=end sp=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=end d=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end da=end sp=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=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=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: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf26.loaded b/regress/sbin/pfctl/pf26.loaded index ef79533eaba..775a952c8c9 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:1) to any - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @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 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf26.optimized b/regress/sbin/pfctl/pf26.optimized index ef79533eaba..775a952c8c9 100644 --- a/regress/sbin/pfctl/pf26.optimized +++ b/regress/sbin/pfctl/pf26.optimized @@ -1,8 +1,8 @@ @0 block drop in on lo0 inet from ! (lo0:1) to any - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @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 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf27.loaded b/regress/sbin/pfctl/pf27.loaded index 9c262fdcd36..55b4d01f00b 100644 --- a/regress/sbin/pfctl/pf27.loaded +++ b/regress/sbin/pfctl/pf27.loaded @@ -1,48 +1,48 @@ @0 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.1 - [ Skip steps: i=end d=6 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=6 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 ] @1 match out on lo0 inet from 127.0.0.1 to any nat-to 127.0.0.1 - [ Skip steps: i=end d=6 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=6 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 ] @2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.1 - [ Skip steps: i=end d=6 f=end p=end sa=4 sp=end da=4 dp=end ] + [ Skip steps: i=end r=6 d=end f=end p=end sa=4 da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet from any to 127.0.0.1 nat-to (lo0:1) round-robin - [ Skip steps: i=end d=6 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=6 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 match out on lo0 inet from 127.0.0.1 to any nat-to (lo0:1) round-robin - [ Skip steps: i=end d=6 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=6 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 match out on lo0 inet from any to (lo0:1) nat-to 127.0.0.1 - [ Skip steps: i=end f=end p=end sa=7 sp=end dp=end ] + [ Skip steps: i=end d=end f=end p=end sa=7 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @7 match in on lo0 inet from 127.0.0.1 to any rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @8 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sa=10 sp=end da=10 dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=10 da=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in on lo0 inet from any to 127.0.0.1 rdr-to (lo0:1) round-robin - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @10 match in on lo0 inet from 127.0.0.1 to any rdr-to (lo0:1) round-robin - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @11 match in on lo0 inet from any to (lo0:1) rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf27.optimized b/regress/sbin/pfctl/pf27.optimized index 3d0900b9f6e..10b24297005 100644 --- a/regress/sbin/pfctl/pf27.optimized +++ b/regress/sbin/pfctl/pf27.optimized @@ -1,40 +1,40 @@ @0 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.1 - [ Skip steps: i=end d=5 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=5 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 ] @1 match out on lo0 inet from 127.0.0.1 to any nat-to 127.0.0.1 - [ Skip steps: i=end d=5 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=5 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 ] @2 match out on lo0 inet from any to 127.0.0.1 nat-to (lo0:1) round-robin - [ Skip steps: i=end d=5 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=5 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 ] @3 match out on lo0 inet from 127.0.0.1 to any nat-to (lo0:1) round-robin - [ Skip steps: i=end d=5 f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=5 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 match out on lo0 inet from any to (lo0:1) nat-to 127.0.0.1 - [ Skip steps: i=end f=end p=end sa=6 sp=end dp=end ] + [ Skip steps: i=end d=end f=end p=end sa=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @6 match in on lo0 inet from 127.0.0.1 to any rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @7 match in on lo0 inet from any to 127.0.0.1 rdr-to (lo0:1) round-robin - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @8 match in on lo0 inet from 127.0.0.1 to any rdr-to (lo0:1) round-robin - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] + [ Skip steps: i=end r=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 ] @9 match in on lo0 inet from any to (lo0:1) rdr-to 127.0.0.1 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf28.loaded b/regress/sbin/pfctl/pf28.loaded index 116076ae840..66831726ec9 100644 --- a/regress/sbin/pfctl/pf28.loaded +++ b/regress/sbin/pfctl/pf28.loaded @@ -1,24 +1,24 @@ @0 block drop in log (all) quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in log (all) quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in log quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in log on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in log (all) on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf28.optimized b/regress/sbin/pfctl/pf28.optimized index 116076ae840..66831726ec9 100644 --- a/regress/sbin/pfctl/pf28.optimized +++ b/regress/sbin/pfctl/pf28.optimized @@ -1,24 +1,24 @@ @0 block drop in log (all) quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in log (all) quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in log quick on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in log on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in log (all) on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf29.loaded b/regress/sbin/pfctl/pf29.loaded index 6c4baf48f1a..1789a22e83e 100644 --- a/regress/sbin/pfctl/pf29.loaded +++ b/regress/sbin/pfctl/pf29.loaded @@ -1,12 +1,12 @@ @0 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 8000:8010 rdr-to 127.0.0.1 port 8000:8010 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 21:22 rdr-to 127.0.0.1 port 179:180 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 1000:3000 rdr-to 127.0.0.1 port 22 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf29.optimized b/regress/sbin/pfctl/pf29.optimized index 6c4baf48f1a..1789a22e83e 100644 --- a/regress/sbin/pfctl/pf29.optimized +++ b/regress/sbin/pfctl/pf29.optimized @@ -1,12 +1,12 @@ @0 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 8000:8010 rdr-to 127.0.0.1 port 8000:8010 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 21:22 rdr-to 127.0.0.1 port 179:180 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 1000:3000 rdr-to 127.0.0.1 port 22 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf3.loaded b/regress/sbin/pfctl/pf3.loaded index dbeea3c5f17..9b887cb9526 100644 --- a/regress/sbin/pfctl/pf3.loaded +++ b/regress/sbin/pfctl/pf3.loaded @@ -1,52 +1,52 @@ -@0 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=2 sa=end sp=end da=end dp=end ] +@0 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=2 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@1 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in proto tcp all flags FPUEW/FSRPAUEW - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in proto tcp all flags FS/FSRA - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in proto tcp all flags /FSRAW - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in proto udp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@5 pass in proto udp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in proto icmp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@6 pass in proto icmp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in proto tcp all flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@7 pass in proto tcp all flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass in all flags S/SA no state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 pass in all no state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass in all flags any keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@10 pass in all flags any + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@11 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@12 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf3.ok b/regress/sbin/pfctl/pf3.ok index 1d9432f9d6c..7eb9722cde0 100644 --- a/regress/sbin/pfctl/pf3.ok +++ b/regress/sbin/pfctl/pf3.ok @@ -1,13 +1,13 @@ -pass in all flags S/SA keep state -pass in all flags S/SA keep state +pass in all flags S/SA +pass in all flags S/SA block drop in proto tcp all flags FPUEW/FSRPAUEW block drop in proto tcp all flags FS/FSRA block drop in proto tcp all flags /FSRAW -pass in proto udp all keep state -pass in proto icmp all keep state -pass in proto tcp all flags S/SA keep state +pass in proto udp all +pass in proto icmp all +pass in proto tcp all flags S/SA pass in all flags S/SA no state pass in all no state -pass in all flags any keep state -pass in all flags S/SA keep state -pass in all flags S/SA keep state +pass in all flags any +pass in all flags S/SA +pass in all flags S/SA diff --git a/regress/sbin/pfctl/pf3.optimized b/regress/sbin/pfctl/pf3.optimized index e7b9eb09fe7..096fed08857 100644 --- a/regress/sbin/pfctl/pf3.optimized +++ b/regress/sbin/pfctl/pf3.optimized @@ -1,36 +1,36 @@ -@0 pass in all flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@0 pass in all flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in proto tcp all flags FPUEW/FSRPAUEW - [ Skip steps: i=end d=end f=end p=4 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in proto tcp all flags FS/FSRA - [ Skip steps: i=end d=end f=end p=4 sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=4 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in proto tcp all flags /FSRAW - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in proto udp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@4 pass in proto udp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in proto icmp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@5 pass in proto icmp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in proto tcp all flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@6 pass in proto tcp all flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in all no state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in all flags any keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@8 pass in all flags any + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf30.loaded b/regress/sbin/pfctl/pf30.loaded index e03a3b26b57..74f8675b7e9 100644 --- a/regress/sbin/pfctl/pf30.loaded +++ b/regress/sbin/pfctl/pf30.loaded @@ -1,4 +1,4 @@ @0 block drop in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf30.optimized b/regress/sbin/pfctl/pf30.optimized index e03a3b26b57..74f8675b7e9 100644 --- a/regress/sbin/pfctl/pf30.optimized +++ b/regress/sbin/pfctl/pf30.optimized @@ -1,4 +1,4 @@ @0 block drop in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf31.loaded b/regress/sbin/pfctl/pf31.loaded index 29a3b0a09a1..d382f77993d 100644 --- a/regress/sbin/pfctl/pf31.loaded +++ b/regress/sbin/pfctl/pf31.loaded @@ -1,72 +1,72 @@ @0 block return in on lo0 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block return in on lo0 inet all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return in on lo0 inet6 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in on lo0 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in on lo0 inet all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in on lo0 inet6 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in on lo0 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in on lo0 inet all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in on lo0 inet6 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block return in on lo0 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block return in on lo0 inet all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block return in on lo0 inet6 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in on lo0 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block drop in on lo0 inet all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop in on lo0 inet6 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block return in on lo0 all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 block return in on lo0 inet all - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 block return in on lo0 inet6 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf31.optimized b/regress/sbin/pfctl/pf31.optimized index d1b6d7ed604..fc5f0ebacbf 100644 --- a/regress/sbin/pfctl/pf31.optimized +++ b/regress/sbin/pfctl/pf31.optimized @@ -1,20 +1,20 @@ @0 block return in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return in on lo0 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf32.loaded b/regress/sbin/pfctl/pf32.loaded index ee61b979f94..30afa5afc90 100644 --- a/regress/sbin/pfctl/pf32.loaded +++ b/regress/sbin/pfctl/pf32.loaded @@ -1,24 +1,24 @@ -@0 pass in inet from 10.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=2 sp=end da=end dp=end ] +@0 pass in inet from 10.0.0.0/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=2 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet from 10.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@1 pass in inet from 10.0.0.0/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in inet from 192.168.37.0/25 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@2 pass in inet from 192.168.37.0/25 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in inet from 192.168.37.0/24 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@3 pass in inet from 192.168.37.0/24 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet from 192.168.0.0/16 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@4 pass in inet from 192.168.0.0/16 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in inet from 192.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@5 pass in inet from 192.0.0.0/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf32.ok b/regress/sbin/pfctl/pf32.ok index 826ce61ebcb..52fdeb20383 100644 --- a/regress/sbin/pfctl/pf32.ok +++ b/regress/sbin/pfctl/pf32.ok @@ -1,6 +1,6 @@ -pass in inet from 10.0.0.0/8 to any flags S/SA keep state -pass in inet from 10.0.0.0/8 to any flags S/SA keep state -pass in inet from 192.168.37.0/25 to any flags S/SA keep state -pass in inet from 192.168.37.0/24 to any flags S/SA keep state -pass in inet from 192.168.0.0/16 to any flags S/SA keep state -pass in inet from 192.0.0.0/8 to any flags S/SA keep state +pass in inet from 10.0.0.0/8 to any flags S/SA +pass in inet from 10.0.0.0/8 to any flags S/SA +pass in inet from 192.168.37.0/25 to any flags S/SA +pass in inet from 192.168.37.0/24 to any flags S/SA +pass in inet from 192.168.0.0/16 to any flags S/SA +pass in inet from 192.0.0.0/8 to any flags S/SA diff --git a/regress/sbin/pfctl/pf32.optimized b/regress/sbin/pfctl/pf32.optimized index 0f1fb723ffb..e9b73071683 100644 --- a/regress/sbin/pfctl/pf32.optimized +++ b/regress/sbin/pfctl/pf32.optimized @@ -1,8 +1,8 @@ -@0 pass in inet from 10.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@0 pass in inet from 10.0.0.0/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet from 192.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in inet from 192.0.0.0/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf33.ok b/regress/sbin/pfctl/pf33.ok index a45faf50749..86e703e27ee 100644 --- a/regress/sbin/pfctl/pf33.ok +++ b/regress/sbin/pfctl/pf33.ok @@ -8,8 +8,8 @@ queue mail bandwidth 10% queue ssh bandwidth 200Kb priority 7 cbq( borrow ) queue rsets bandwidth 150Kb priority 0 cbq( red ) block return in on lo0 inet all queue rsets -pass in on lo0 inet proto tcp from any to any port = www flags S/SA keep state queue http -pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA keep state queue ssh -pass in on lo0 inet proto tcp from any to any port = ssh flags S/SA keep state queue ssh -pass out on lo0 inet proto tcp from any to any port = smtp flags S/SA keep state queue mail -pass out on lo0 inet all flags S/SA keep state +pass in on lo0 inet proto tcp from any to any port = www flags S/SA queue http +pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA queue ssh +pass in on lo0 inet proto tcp from any to any port = ssh flags S/SA queue ssh +pass out on lo0 inet proto tcp from any to any port = smtp flags S/SA queue mail +pass out on lo0 inet all flags S/SA diff --git a/regress/sbin/pfctl/pf34.loaded b/regress/sbin/pfctl/pf34.loaded index c626fc81346..191bfcf3e61 100644 --- a/regress/sbin/pfctl/pf34.loaded +++ b/regress/sbin/pfctl/pf34.loaded @@ -1,20 +1,20 @@ -@0 pass in inet from any to 127.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end p=4 sa=4 sp=end dp=end ] +@0 pass in inet from any to 127.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end p=4 sa=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet6 from any to 2000::1 flags S/SA keep state - [ Skip steps: i=end d=end p=4 sa=4 sp=end dp=end ] +@1 pass in inet6 from any to 2000::1 flags S/SA + [ Skip steps: i=end r=end d=end p=4 sa=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in all flags S/SA keep state probability 50% - [ Skip steps: i=end d=end f=4 p=4 sa=4 sp=end da=end dp=end ] +@2 pass in all flags S/SA probability 50% + [ Skip steps: i=end r=end d=end f=4 p=4 sa=4 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in all flags S/SA keep state probability 50% - [ Skip steps: i=end d=end sp=end da=end dp=end ] +@3 pass in all flags S/SA probability 50% + [ Skip steps: i=end r=end d=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet6 proto tcp from ::1 to any flags S/SA keep state probability 0.8% - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@4 pass in inet6 proto tcp from ::1 to any flags S/SA probability 0.8% + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf34.ok b/regress/sbin/pfctl/pf34.ok index a91f1ae50d2..766ddc9512b 100644 --- a/regress/sbin/pfctl/pf34.ok +++ b/regress/sbin/pfctl/pf34.ok @@ -1,5 +1,5 @@ -pass in inet from any to 127.0.0.1 flags S/SA keep state -pass in inet6 from any to 2000::1 flags S/SA keep state -pass in all flags S/SA keep state probability 50% -pass in all flags S/SA keep state probability 50% -pass in inet6 proto tcp from ::1 to any flags S/SA keep state probability 0.8% +pass in inet from any to 127.0.0.1 flags S/SA +pass in inet6 from any to 2000::1 flags S/SA +pass in all flags S/SA probability 50% +pass in all flags S/SA probability 50% +pass in inet6 proto tcp from ::1 to any flags S/SA probability 0.8% diff --git a/regress/sbin/pfctl/pf34.optimized b/regress/sbin/pfctl/pf34.optimized index c626fc81346..191bfcf3e61 100644 --- a/regress/sbin/pfctl/pf34.optimized +++ b/regress/sbin/pfctl/pf34.optimized @@ -1,20 +1,20 @@ -@0 pass in inet from any to 127.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end p=4 sa=4 sp=end dp=end ] +@0 pass in inet from any to 127.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end p=4 sa=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in inet6 from any to 2000::1 flags S/SA keep state - [ Skip steps: i=end d=end p=4 sa=4 sp=end dp=end ] +@1 pass in inet6 from any to 2000::1 flags S/SA + [ Skip steps: i=end r=end d=end p=4 sa=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in all flags S/SA keep state probability 50% - [ Skip steps: i=end d=end f=4 p=4 sa=4 sp=end da=end dp=end ] +@2 pass in all flags S/SA probability 50% + [ Skip steps: i=end r=end d=end f=4 p=4 sa=4 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in all flags S/SA keep state probability 50% - [ Skip steps: i=end d=end sp=end da=end dp=end ] +@3 pass in all flags S/SA probability 50% + [ Skip steps: i=end r=end d=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet6 proto tcp from ::1 to any flags S/SA keep state probability 0.8% - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@4 pass in inet6 proto tcp from ::1 to any flags S/SA probability 0.8% + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf35.ok b/regress/sbin/pfctl/pf35.ok index 392f89d29c6..de66819e304 100644 --- a/regress/sbin/pfctl/pf35.ok +++ b/regress/sbin/pfctl/pf35.ok @@ -11,8 +11,8 @@ queue ssh bandwidth 20% cbq( borrow ) { ssh_interactive ssh_bulk } queue ssh_interactive bandwidth 30% priority 7 queue ssh_bulk bandwidth 70% priority 0 qlimit 60 block return out on lo0 inet all queue std -pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www flags S/SA keep state queue developers -pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www flags S/SA keep state queue employees -pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA tos 0x10 keep state queue ssh_interactive -pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA tos 0x08 keep state queue ssh_bulk -pass out on lo0 inet proto tcp from any to any port = smtp flags S/SA keep state queue mail +pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www flags S/SA queue developers +pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www flags S/SA queue employees +pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA tos 0x10 queue ssh_interactive +pass out on lo0 inet proto tcp from any to any port = ssh flags S/SA tos 0x08 queue ssh_bulk +pass out on lo0 inet proto tcp from any to any port = smtp flags S/SA queue mail diff --git a/regress/sbin/pfctl/pf36.in b/regress/sbin/pfctl/pf36.in index bc7d7c7b884..da32298516a 100644 --- a/regress/sbin/pfctl/pf36.in +++ b/regress/sbin/pfctl/pf36.in @@ -1,6 +1,6 @@ # test nat pools syntax -match out on lo0 from any to 127.0.0.1 nat-to { 127.0.0.1, 127.0.0.2 } +#match out on lo0 from any to 127.0.0.1 nat-to { 127.0.0.1, 127.0.0.2 } match out on lo0 from any to 127.0.0.1 nat-to { 127.0.0.1, 127.0.0.2 } round-robin match out on lo0 from any to 127.0.0.1 nat-to lo0/24 bitmask static-port match out on lo0 from any to 127.0.0.1 nat-to lo0/24 random diff --git a/regress/sbin/pfctl/pf36.loaded b/regress/sbin/pfctl/pf36.loaded index ed59f6a3d4d..39100fcf5a9 100644 --- a/regress/sbin/pfctl/pf36.loaded +++ b/regress/sbin/pfctl/pf36.loaded @@ -1,56 +1,52 @@ @0 match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_0:2> round-robin - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_1:2> round-robin - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@1 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 bitmask static-port + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 bitmask static-port - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 random + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 random - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@3 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@4 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@5 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 round-robin + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 round-robin - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@6 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_3:2> round-robin + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_2:2> round-robin - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@7 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_6:2> round-robin + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_5:2> round-robin - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@8 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 bitmask + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 bitmask - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@9 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 random + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 random - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@10 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@11 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 - [ 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 ] -@13 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 round-robin - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@12 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 round-robin + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf36.ok b/regress/sbin/pfctl/pf36.ok index c61138b0e35..f517c34edfa 100644 --- a/regress/sbin/pfctl/pf36.ok +++ b/regress/sbin/pfctl/pf36.ok @@ -5,16 +5,14 @@ table <__automatic_3> const { 127.0.0.1 127.0.0.2 } table <__automatic_4> const { 127.0.0.1 127.0.0.2 } table <__automatic_5> const { 127.0.0.1 127.0.0.2 } table <__automatic_6> const { 127.0.0.1 127.0.0.2 } -table <__automatic_7> const { 127.0.0.1 127.0.0.2 } match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_0> round-robin -match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_1> round-robin match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 bitmask static-port match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 random match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 round-robin -match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_2> round-robin -match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_5> round-robin +match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_3> round-robin +match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_6> round-robin match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 bitmask match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 random match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef diff --git a/regress/sbin/pfctl/pf36.optimized b/regress/sbin/pfctl/pf36.optimized index ed59f6a3d4d..39100fcf5a9 100644 --- a/regress/sbin/pfctl/pf36.optimized +++ b/regress/sbin/pfctl/pf36.optimized @@ -1,56 +1,52 @@ @0 match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_0:2> round-robin - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_1:2> round-robin - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@1 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 bitmask static-port + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 bitmask static-port - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 random + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 random - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@3 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@4 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 + [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 - [ Skip steps: i=end d=7 f=end p=end sa=end sp=end da=end dp=end ] +@5 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 round-robin + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 round-robin - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@6 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_3:2> round-robin + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_2:2> round-robin - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@7 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_6:2> round-robin + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_5:2> round-robin - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@8 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 bitmask + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 bitmask - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@9 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 random + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 random - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@10 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@11 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 - [ 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 ] -@13 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 round-robin - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@12 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 round-robin + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf38.loaded b/regress/sbin/pfctl/pf38.loaded index 40c5f36a7dd..6a6664d6adf 100644 --- a/regress/sbin/pfctl/pf38.loaded +++ b/regress/sbin/pfctl/pf38.loaded @@ -1,16 +1,16 @@ -@0 pass in on tun1000000 proto tcp all user = 3 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in on tun1000000 proto tcp all user = 3 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on tun1000000 proto tcp all group = 7 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in on tun1000000 proto tcp all group = 7 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@3 pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf38.ok b/regress/sbin/pfctl/pf38.ok index 77e2ee63bf5..c4967bb4d0e 100644 --- a/regress/sbin/pfctl/pf38.ok +++ b/regress/sbin/pfctl/pf38.ok @@ -1,4 +1,4 @@ -pass in on tun1000000 proto tcp all user = 3 flags S/SA keep state -pass in on tun1000000 proto tcp all group = 7 flags S/SA keep state -pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA keep state -pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA keep state +pass in on tun1000000 proto tcp all user = 3 flags S/SA +pass in on tun1000000 proto tcp all group = 7 flags S/SA +pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA +pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA diff --git a/regress/sbin/pfctl/pf38.optimized b/regress/sbin/pfctl/pf38.optimized index 40c5f36a7dd..6a6664d6adf 100644 --- a/regress/sbin/pfctl/pf38.optimized +++ b/regress/sbin/pfctl/pf38.optimized @@ -1,16 +1,16 @@ -@0 pass in on tun1000000 proto tcp all user = 3 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in on tun1000000 proto tcp all user = 3 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on tun1000000 proto tcp all group = 7 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in on tun1000000 proto tcp all group = 7 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@3 pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf39.loaded b/regress/sbin/pfctl/pf39.loaded index 7ce257d4abc..5acfb16c0a9 100644 --- a/regress/sbin/pfctl/pf39.loaded +++ b/regress/sbin/pfctl/pf39.loaded @@ -1,36 +1,36 @@ -@0 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state fragment label "blah" - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@0 pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah" + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +@1 pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +@2 pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +@3 pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@4 pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log quick on lo0 inet proto tcp all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=7 sa=end sp=end da=end dp=end ] +@5 pass in log quick on lo0 inet proto tcp all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=7 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 keep state label "blah" queue blah - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@6 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@7 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in log quick on lo0 inet proto tcp all flags S/SA keep state allow-opts - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@8 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf39.ok b/regress/sbin/pfctl/pf39.ok index 50e623de779..006c39525f7 100644 --- a/regress/sbin/pfctl/pf39.ok +++ b/regress/sbin/pfctl/pf39.ok @@ -12,12 +12,12 @@ o_fragment = "fragment " o_allowopts = "allow-opts " o_label = "label blah" o_qname = "queue blah" -pass in log quick on lo0 inet proto tcp all tos 0x08 keep state fragment label "blah" -pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah -pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah -pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah -pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah -pass in log quick on lo0 inet proto tcp all flags S/SA keep state -pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 keep state label "blah" queue blah -pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 keep state -pass in log quick on lo0 inet proto tcp all flags S/SA keep state allow-opts +pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah" +pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah +pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah +pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah +pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah +pass in log quick on lo0 inet proto tcp all flags S/SA +pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah +pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 +pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts diff --git a/regress/sbin/pfctl/pf39.optimized b/regress/sbin/pfctl/pf39.optimized index 7ce257d4abc..5acfb16c0a9 100644 --- a/regress/sbin/pfctl/pf39.optimized +++ b/regress/sbin/pfctl/pf39.optimized @@ -1,36 +1,36 @@ -@0 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state fragment label "blah" - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@0 pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah" + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +@1 pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +@2 pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +@3 pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label "blah" queue blah - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@4 pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 allow-opts label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log quick on lo0 inet proto tcp all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=7 sa=end sp=end da=end dp=end ] +@5 pass in log quick on lo0 inet proto tcp all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=7 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 keep state label "blah" queue blah - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@6 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname=blah qid=1 pqname= pqid=1 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@7 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in log quick on lo0 inet proto tcp all flags S/SA keep state allow-opts - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@8 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf4.loaded b/regress/sbin/pfctl/pf4.loaded index 322ffafde1f..196b31234c2 100644 --- a/regress/sbin/pfctl/pf4.loaded +++ b/regress/sbin/pfctl/pf4.loaded @@ -1,248 +1,248 @@ @0 block drop in all - [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=5 sa=5 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in proto tcp all - [ Skip steps: i=end d=end f=5 p=3 sa=5 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=5 p=3 sa=5 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in proto tcp all - [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=5 sa=5 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in proto udp all - [ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=5 sa=5 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in all - [ Skip steps: i=end d=end p=9 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end p=9 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in inet from 10.0.0.0/8 to any - [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=9 p=9 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in inet from ! 10.0.0.0/8 to any - [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=9 p=9 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in inet from 10.0.0.0/8 to any - [ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=10 ] + [ Skip steps: i=end r=end d=end f=9 p=9 da=14 sp=9 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in inet from 172.16.0.0/12 to any - [ Skip steps: i=end d=end da=14 dp=10 ] + [ Skip steps: i=end r=end d=end da=14 dp=10 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in proto tcp from any port = ssh to any - [ Skip steps: i=end d=end f=14 p=38 sa=14 sp=11 da=14 ] + [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 sp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in proto tcp from any port = ssh to any port 1024:2048 - [ Skip steps: i=end d=end f=14 p=38 sa=14 da=14 dp=14 ] + [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in proto tcp from any port 21 >< 2048 to any port 1024:2048 - [ Skip steps: i=end d=end f=14 p=38 sa=14 da=14 dp=14 ] + [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in proto tcp from any port != 1234 to any port 1024:2048 - [ Skip steps: i=end d=end f=14 p=38 sa=14 da=14 dp=14 ] + [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block drop in proto tcp from any port >= 80 to any port 1024:2048 - [ Skip steps: i=end d=end p=38 ] + [ Skip steps: i=end r=end d=end p=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=17 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=17 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=17 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=17 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=20 ] +@17 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=20 da=20 ] +@18 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 sa=26 ] +@19 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=23 ] +@20 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=23 ] +@21 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 ] +@22 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=26 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=26 sp=26 da=26 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 ] + [ Skip steps: i=end r=end d=end f=end p=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=29 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=29 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=29 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=29 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@29 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=32 ] +@29 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@30 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=32 da=32 ] +@30 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@31 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 sa=38 ] +@31 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@32 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=35 ] +@32 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=35 ] +@33 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@34 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 ] +@34 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @35 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=38 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @36 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=38 sa=38 sp=38 da=38 ] + [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=38 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @37 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end ] + [ Skip steps: i=end r=end d=end f=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @38 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=41 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=41 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @39 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=41 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=41 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @40 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@41 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=44 ] +@41 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@42 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=44 da=44 ] +@42 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@43 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=50 ] +@43 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=end sa=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@44 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=47 ] +@44 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@45 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=47 ] +@45 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 ] +@46 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @47 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=50 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @48 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=50 sp=50 da=50 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @49 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end ] + [ Skip steps: i=end r=end d=end f=end p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @50 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=53 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @51 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=53 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @52 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=end sp=56 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@53 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=56 ] +@53 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=56 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@54 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=end sp=56 da=56 ] +@54 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=56 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@55 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=end ] +@55 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=end sa=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@56 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=59 ] +@56 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@57 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=59 ] +@57 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@58 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end ] +@58 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @59 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @60 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @61 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf4.ok b/regress/sbin/pfctl/pf4.ok index 37c515c0985..c2fa6d44b06 100644 --- a/regress/sbin/pfctl/pf4.ok +++ b/regress/sbin/pfctl/pf4.ok @@ -15,48 +15,48 @@ block drop in proto tcp from any port >= 80 to any port 1024:2048 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port 6669:65535 +block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 +block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535 +block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 +block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port 6669:65535 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535 +block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 +block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 +block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port 6669:65535 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535 diff --git a/regress/sbin/pfctl/pf4.optimized b/regress/sbin/pfctl/pf4.optimized index fb3454c2dbd..7bb359489fb 100644 --- a/regress/sbin/pfctl/pf4.optimized +++ b/regress/sbin/pfctl/pf4.optimized @@ -1,8 +1,8 @@ @0 block drop in all - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in inet from ! 10.0.0.0/8 to any - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf40.loaded b/regress/sbin/pfctl/pf40.loaded index 7a6af32bf13..710a067c92f 100644 --- a/regress/sbin/pfctl/pf40.loaded +++ b/regress/sbin/pfctl/pf40.loaded @@ -1,80 +1,80 @@ @0 block drop all - [ Skip steps: i=12 d=4 f=end p=2 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 r=4 d=end f=end p=2 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block return all - [ Skip steps: i=12 d=4 f=end sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 r=4 d=end f=end sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst proto tcp all - [ Skip steps: i=12 d=4 f=end sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 r=4 d=end f=end sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass all flags S/SA keep state - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +@3 pass all flags S/SA + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in all no state - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass out all no state - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass all no state - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in all - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop out all - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop all - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass in all flags S/SA keep state - [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +@10 pass in all flags S/SA + [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass out all flags S/SA keep state - [ Skip steps: f=end p=15 sa=end sp=end da=end dp=19 ] +@11 pass out all flags S/SA + [ Skip steps: d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop on lo0 all - [ Skip steps: i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ] + [ Skip steps: i=15 r=17 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass on lo0 all flags S/SA keep state - [ Skip steps: i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ] +@13 pass on lo0 all flags S/SA + [ Skip steps: i=15 r=17 d=end f=end p=15 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop on lo0 all - [ Skip steps: d=17 f=end sa=end sp=end da=end dp=19 ] + [ Skip steps: r=17 d=end f=end sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass proto tcp all flags S/SA keep state - [ Skip steps: i=19 d=17 f=end sa=end sp=end da=end dp=19 ] +@15 pass proto tcp all flags S/SA + [ Skip steps: i=19 r=17 d=end f=end sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass proto udp all keep state - [ Skip steps: i=19 f=end p=19 sa=end sp=end da=end dp=19 ] +@16 pass proto udp all + [ Skip steps: i=19 d=end f=end p=19 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in proto udp all keep state - [ Skip steps: i=19 f=end p=19 sa=end sp=end da=end dp=19 ] +@17 pass in proto udp all + [ Skip steps: i=19 d=end f=end p=19 sa=end da=end sp=end dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass out proto udp all keep state - [ Skip steps: d=end f=end sa=end sp=end da=end ] +@18 pass out proto udp all + [ Skip steps: r=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass out on lo0 proto tcp from any to any port = smtp flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@19 pass out on lo0 proto tcp from any to any port = smtp flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf40.ok b/regress/sbin/pfctl/pf40.ok index 1a740bb9647..9781cce6610 100644 --- a/regress/sbin/pfctl/pf40.ok +++ b/regress/sbin/pfctl/pf40.ok @@ -1,20 +1,20 @@ block drop all block return all block return-rst proto tcp all -pass all flags S/SA keep state +pass all flags S/SA pass in all no state pass out all no state pass all no state block drop in all block drop out all block drop all -pass in all flags S/SA keep state -pass out all flags S/SA keep state +pass in all flags S/SA +pass out all flags S/SA block drop on lo0 all -pass on lo0 all flags S/SA keep state +pass on lo0 all flags S/SA block drop on lo0 all -pass proto tcp all flags S/SA keep state -pass proto udp all keep state -pass in proto udp all keep state -pass out proto udp all keep state -pass out on lo0 proto tcp from any to any port = smtp flags S/SA keep state +pass proto tcp all flags S/SA +pass proto udp all +pass in proto udp all +pass out proto udp all +pass out on lo0 proto tcp from any to any port = smtp flags S/SA diff --git a/regress/sbin/pfctl/pf40.optimized b/regress/sbin/pfctl/pf40.optimized index 61b43756f82..054ef8b2191 100644 --- a/regress/sbin/pfctl/pf40.optimized +++ b/regress/sbin/pfctl/pf40.optimized @@ -1,52 +1,52 @@ @0 block drop all - [ Skip steps: i=8 d=6 f=end p=2 sa=end sp=end da=end dp=end ] + [ Skip steps: i=8 r=6 d=end f=end p=2 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block return all - [ Skip steps: i=8 d=6 f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=8 r=6 d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst proto tcp all - [ Skip steps: i=8 d=6 f=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=8 r=6 d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass all flags S/SA keep state - [ Skip steps: i=8 d=6 f=end p=11 sa=end sp=end da=end dp=end ] +@3 pass all flags S/SA + [ Skip steps: i=8 r=6 d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass all no state - [ Skip steps: i=8 d=6 f=end p=11 sa=end sp=end da=end dp=end ] + [ Skip steps: i=8 r=6 d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop all - [ Skip steps: i=8 f=end p=11 sa=end sp=end da=end dp=end ] + [ Skip steps: i=8 d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in all flags S/SA keep state - [ Skip steps: i=8 f=end p=11 sa=end sp=end da=end dp=end ] +@6 pass in all flags S/SA + [ Skip steps: i=8 d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass out all flags S/SA keep state - [ Skip steps: f=end p=11 sa=end sp=end da=end dp=end ] +@7 pass out all flags S/SA + [ Skip steps: d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop on lo0 all - [ Skip steps: i=11 d=end f=end p=11 sa=end sp=end da=end dp=end ] + [ Skip steps: i=11 r=end d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass on lo0 all flags S/SA keep state - [ Skip steps: i=11 d=end f=end p=11 sa=end sp=end da=end dp=end ] +@9 pass on lo0 all flags S/SA + [ Skip steps: i=11 r=end d=end f=end p=11 sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop on lo0 all - [ Skip steps: d=end f=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass proto tcp all flags S/SA keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] +@11 pass proto tcp all flags S/SA + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass proto udp all keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@12 pass proto udp all + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf43.ok b/regress/sbin/pfctl/pf43.ok index def31b543a2..1a153602d91 100644 --- a/regress/sbin/pfctl/pf43.ok +++ b/regress/sbin/pfctl/pf43.ok @@ -1,8 +1,8 @@ altq on lo0 cbq bandwidth 100Mb tbrsize 3648 queue { bulk prio } queue bulk bandwidth 70% cbq( default ) queue prio bandwidth 30% priority 7 -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA keep state queue(bulk, prio) -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA keep state queue bulk -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA keep state queue(bulk, prio) -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA keep state queue bulk -pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA keep state queue(bulk, prio) +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue(bulk, prio) +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue bulk +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue(bulk, prio) +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue bulk +pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh flags S/SA queue(bulk, prio) diff --git a/regress/sbin/pfctl/pf44.loaded b/regress/sbin/pfctl/pf44.loaded index 9f0b8e3807f..e2a6c95be66 100644 --- a/regress/sbin/pfctl/pf44.loaded +++ b/regress/sbin/pfctl/pf44.loaded @@ -1,24 +1,24 @@ @0 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf44.optimized b/regress/sbin/pfctl/pf44.optimized index e17fe45c1f8..e5cb7c46ef6 100644 --- a/regress/sbin/pfctl/pf44.optimized +++ b/regress/sbin/pfctl/pf44.optimized @@ -1,8 +1,8 @@ @0 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf46.loaded b/regress/sbin/pfctl/pf46.loaded index 75ca492540b..98b2fe3f488 100644 --- a/regress/sbin/pfctl/pf46.loaded +++ b/regress/sbin/pfctl/pf46.loaded @@ -1,28 +1,28 @@ -@0 pass in on lo0 inet all flags S/SA keep state route-to <__automatic_0:2> round-robin - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in on lo0 inet all flags S/SA route-to <__automatic_0:2> round-robin + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out on lo0 inet all flags S/SA keep state route-to <__automatic_1:2> round-robin - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass out on lo0 inet all flags S/SA route-to <__automatic_1:2> round-robin + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo0 inet all flags S/SA keep state route-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 bitmask + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out on lo0 inet all flags S/SA keep state dup-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@3 pass out on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo0 inet all flags S/SA keep state reply-to 127.0.0.0/28@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@4 pass in on lo0 inet all flags S/SA reply-to 127.0.0.0/28@pflog0 + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out on lo0 inet all flags S/SA keep state route-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@5 pass out on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in on lo0 inet all flags S/SA keep state dup-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@6 pass in on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf46.ok b/regress/sbin/pfctl/pf46.ok index b8440124c10..37cb299ef5b 100644 --- a/regress/sbin/pfctl/pf46.ok +++ b/regress/sbin/pfctl/pf46.ok @@ -1,9 +1,9 @@ table <__automatic_0> const { 127.0.0.1@pflog0 127.0.0.2@pflog0 } table <__automatic_1> const { 127.0.0.1@pflog0 127.0.0.2@pflog0 } -pass in on lo0 inet all flags S/SA keep state route-to <__automatic_0> round-robin -pass out on lo0 inet all flags S/SA keep state route-to <__automatic_1> round-robin -pass in on lo0 inet all flags S/SA keep state route-to 127.0.0.0/24@pflog0 -pass out on lo0 inet all flags S/SA keep state dup-to 127.0.0.0/24@pflog0 -pass in on lo0 inet all flags S/SA keep state reply-to 127.0.0.0/28@pflog0 -pass out on lo0 inet all flags S/SA keep state route-to 127.0.0.0/24@pflog0 -pass in on lo0 inet all flags S/SA keep state dup-to 127.0.0.0/24@pflog0 +pass in on lo0 inet all flags S/SA route-to <__automatic_0> round-robin +pass out on lo0 inet all flags S/SA route-to <__automatic_1> round-robin +pass in on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 bitmask +pass out on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 +pass in on lo0 inet all flags S/SA reply-to 127.0.0.0/28@pflog0 +pass out on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 +pass in on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 diff --git a/regress/sbin/pfctl/pf46.optimized b/regress/sbin/pfctl/pf46.optimized index 75ca492540b..98b2fe3f488 100644 --- a/regress/sbin/pfctl/pf46.optimized +++ b/regress/sbin/pfctl/pf46.optimized @@ -1,28 +1,28 @@ -@0 pass in on lo0 inet all flags S/SA keep state route-to <__automatic_0:2> round-robin - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in on lo0 inet all flags S/SA route-to <__automatic_0:2> round-robin + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out on lo0 inet all flags S/SA keep state route-to <__automatic_1:2> round-robin - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass out on lo0 inet all flags S/SA route-to <__automatic_1:2> round-robin + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo0 inet all flags S/SA keep state route-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 bitmask + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out on lo0 inet all flags S/SA keep state dup-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@3 pass out on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo0 inet all flags S/SA keep state reply-to 127.0.0.0/28@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@4 pass in on lo0 inet all flags S/SA reply-to 127.0.0.0/28@pflog0 + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out on lo0 inet all flags S/SA keep state route-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@5 pass out on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0 + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in on lo0 inet all flags S/SA keep state dup-to 127.0.0.0/24@pflog0 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@6 pass in on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf47.loaded b/regress/sbin/pfctl/pf47.loaded index cdbc89021e9..a4af4257e3b 100644 --- a/regress/sbin/pfctl/pf47.loaded +++ b/regress/sbin/pfctl/pf47.loaded @@ -1,244 +1,244 @@ -@0 pass in on lo0 all flags S/SA keep state - [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@0 pass in on lo0 all flags S/SA + [ Skip steps: r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in all flags S/SA keep state label "any" - [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@1 pass in all flags S/SA label "any" + [ Skip steps: r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo0 all flags S/SA keep state label "lo0" - [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@2 pass in on lo0 all flags S/SA label "lo0" + [ Skip steps: i=end r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo0 all flags S/SA keep state label "lo0lo0" - [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@3 pass in on lo0 all flags S/SA label "lo0lo0" + [ Skip steps: i=end r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo0 all flags S/SA keep state label "any" - [ Skip steps: i=end d=end p=35 sa=6 sp=35 da=22 dp=47 ] +@4 pass in on lo0 all flags S/SA label "any" + [ Skip steps: i=end r=end d=end p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in on lo0 inet all flags S/SA keep state label "any" - [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ] +@5 pass in on lo0 inet all flags S/SA label "any" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "127.0.0.1" - [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=47 ] +@6 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1" + [ Skip steps: i=end r=end d=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state 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=47 ] +@7 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1127.0.0.1" + [ Skip steps: i=end r=end d=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":127.0.0.1:127.0.0.1:" - [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ] +@8 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label ":127.0.0.1:127.0.0.1:" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "127.0.0.0/8" - [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ] +@9 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA label "127.0.0.0/8" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state 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=47 ] +@10 pass in on lo0 inet from 127.0.0.0/16 to any flags S/SA label "127.0.0.0/16127.0.0.0/16" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":127.0.0.0/31:127.0.0.0/31:" - [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=47 ] +@11 pass in on lo0 inet from 127.0.0.0/31 to any flags S/SA label ":127.0.0.0/31:127.0.0.0/31:" + [ Skip steps: i=end r=end d=end p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe80::1" - [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=47 ] +@12 pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1" + [ Skip steps: i=end r=end d=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe80::1fe80::1" - [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=47 ] +@13 pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1fe80::1" + [ Skip steps: i=end r=end d=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":fe80::1:fe80::1:" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@14 pass in on lo0 inet6 from fe80::1 to any flags S/SA label ":fe80::1:fe80::1:" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "::/8" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@15 pass in on lo0 inet6 from ::/8 to any flags S/SA label "::/8" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe00::/8" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@16 pass in on lo0 inet6 from fe00::/8 to any flags S/SA label "fe00::/8" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "::/64::/64" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@17 pass in on lo0 inet6 from ::/64 to any flags S/SA label "::/64::/64" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe80::/64fe80::/64" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@18 pass in on lo0 inet6 from fe80::/64 to any flags S/SA label "fe80::/64fe80::/64" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":::/127:::/127:" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@19 pass in on lo0 inet6 from ::/127 to any flags S/SA label ":::/127:::/127:" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":fe80::/127:fe80::/127:" - [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=47 ] +@20 pass in on lo0 inet6 from fe80::/127 to any flags S/SA label ":fe80::/127:fe80::/127:" + [ Skip steps: i=end r=end d=end p=35 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on lo0 all flags S/SA keep state label "!any!" - [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] +@21 pass in on lo0 all flags S/SA label "!any!" + [ Skip steps: i=end r=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:1) flags S/SA keep state label "(lo0)" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ] +@22 pass in on lo0 inet from any to (lo0:1) flags S/SA label "(lo0)" + [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 da=25 sp=35 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:1) flags S/SA keep state label "(lo0)(lo0)" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ] +@23 pass in on lo0 inet from any to (lo0:1) flags S/SA label "(lo0)(lo0)" + [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 da=25 sp=35 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:1) flags S/SA keep state label " (lo0) (lo0) " - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] +@24 pass in on lo0 inet from any to (lo0:1) flags S/SA label " (lo0) (lo0) " + [ Skip steps: i=end r=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 ] -@25 pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA keep state label "! 127.0.0.0/8" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] +@25 pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA label "! 127.0.0.0/8" + [ Skip steps: i=end r=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 ] -@26 pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA keep state label "! 127.0.0.0/16! 127.0.0.0/16" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] +@26 pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA label "! 127.0.0.0/16! 127.0.0.0/16" + [ Skip steps: i=end r=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 ] -@27 pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA keep state label " ! 127.0.0.0/31 ! 127.0.0.0/31 " - [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] +@27 pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA label " ! 127.0.0.0/31 ! 127.0.0.0/31 " + [ Skip steps: i=end r=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:2) flags S/SA keep state label "! (lo0)" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ] +@28 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label "! (lo0)" + [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 da=31 sp=35 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:2) flags S/SA keep state label "! (lo0)! (lo0)" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ] +@29 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label "! (lo0)! (lo0)" + [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 da=31 sp=35 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:2) flags S/SA keep state label " ! (lo0) ! (lo0) " - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] +@30 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label " ! (lo0) ! (lo0) " + [ Skip steps: i=end r=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 ] -@31 pass in on lo0 inet6 from any to ! ::/8 flags S/SA keep state label "! ::/8" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] +@31 pass in on lo0 inet6 from any to ! ::/8 flags S/SA label "! ::/8" + [ Skip steps: i=end r=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 ] -@32 pass in on lo0 inet6 from any to ! ::/64 flags S/SA keep state label "! ::/64! ::/64" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] +@32 pass in on lo0 inet6 from any to ! ::/64 flags S/SA label "! ::/64! ::/64" + [ Skip steps: i=end r=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 ] -@33 pass in on lo0 inet6 from any to ! ::/127 flags S/SA keep state label " ! ::/127 ! ::/127 " - [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] +@33 pass in on lo0 inet6 from any to ! ::/127 flags S/SA label " ! ::/127 ! ::/127 " + [ Skip steps: i=end r=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 ] -@34 pass in on lo0 all flags S/SA keep state label "xx" - [ Skip steps: i=end d=end f=60 sa=60 da=60 dp=47 ] +@34 pass in on lo0 all flags S/SA label "xx" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@35 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "28><29" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@36 pass in on lo0 proto tcp from any port 28 >< 29 to any flags S/SA label "28><29" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "28<>29" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@37 pass in on lo0 proto tcp from any port 28 <> 29 to any flags S/SA label "28<>29" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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:29 to any flags S/SA keep state - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@38 pass in on lo0 proto tcp from any port 28:29 to any flags S/SA + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "!=28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@39 pass in on lo0 proto tcp from any port != 28 to any flags S/SA label "!=28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "<28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@40 pass in on lo0 proto tcp from any port < 28 to any flags S/SA label "<28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "<=28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@41 pass in on lo0 proto tcp from any port <= 28 to any flags S/SA label "<=28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label ">28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@42 pass in on lo0 proto tcp from any port > 28 to any flags S/SA label ">28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label ">=28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@43 pass in on lo0 proto tcp from any port >= 28 to any flags S/SA label ">=28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "2828" - [ Skip steps: i=end d=end f=60 p=46 sa=60 sp=46 da=60 dp=47 ] +@44 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "2828" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 sp=46 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@45 pass in on lo0 proto tcp from any port = 28 to any flags S/SA keep state label "$28$28$" - [ Skip steps: i=end d=end f=60 sa=60 da=60 dp=47 ] +@45 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "$28$28$" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 pass in on lo0 all flags S/SA keep state - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 ] +@46 pass in on lo0 all flags S/SA + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 ] [ 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 keep state label "29" - [ Skip steps: i=end d=end f=60 p=50 sa=60 sp=60 da=60 ] +@47 pass in on lo0 proto udp from any to any port = 29 label "29" + [ Skip steps: i=end r=end d=end f=60 p=50 sa=60 da=60 sp=60 ] [ 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 keep state label "!=29!=29" - [ Skip steps: i=end d=end f=60 p=50 sa=60 sp=60 da=60 ] +@48 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29" + [ Skip steps: i=end r=end d=end f=60 p=50 sa=60 da=60 sp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@49 pass in on lo0 proto udp from any to any port > 29 keep state label "x>29x>29x" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 ] +@49 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@50 pass in on lo0 all flags S/SA keep state label "ip" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ] +@50 pass in on lo0 all flags S/SA label "ip" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@51 pass in on lo0 proto esp all keep state label "esp" - [ Skip steps: i=end d=end f=60 p=54 sa=60 sp=60 da=60 dp=60 ] +@51 pass in on lo0 proto esp all label "esp" + [ Skip steps: i=end r=end d=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@52 pass in on lo0 proto esp all keep state label "espesp" - [ Skip steps: i=end d=end f=60 p=54 sa=60 sp=60 da=60 dp=60 ] +@52 pass in on lo0 proto esp all label "espesp" + [ Skip steps: i=end r=end d=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@53 pass in on lo0 proto esp all keep state label "-esp-esp-" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ] +@53 pass in on lo0 proto esp all label "-esp-esp-" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@54 pass in on lo0 proto 166 all keep state label "166" - [ Skip steps: i=end d=end f=60 p=57 sa=60 sp=60 da=60 dp=60 ] +@54 pass in on lo0 proto 166 all label "166" + [ Skip steps: i=end r=end d=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@55 pass in on lo0 proto 166 all keep state label "166166" - [ Skip steps: i=end d=end f=60 p=57 sa=60 sp=60 da=60 dp=60 ] +@55 pass in on lo0 proto 166 all label "166166" + [ Skip steps: i=end r=end d=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@56 pass in on lo0 proto 166 all keep state label "_166_166_" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ] +@56 pass in on lo0 proto 166 all label "_166_166_" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@57 pass in on lo0 all flags S/SA keep state label "57" - [ Skip steps: i=end d=end f=60 p=60 sa=60 sp=60 da=60 dp=60 ] +@57 pass in on lo0 all flags S/SA label "57" + [ Skip steps: i=end r=end d=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@58 pass in on lo0 all flags S/SA keep state label "5858" - [ Skip steps: i=end d=end f=60 p=60 sa=60 sp=60 da=60 dp=60 ] +@58 pass in on lo0 all flags S/SA label "5858" + [ Skip steps: i=end r=end d=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@59 pass in on lo0 all flags S/SA keep state label "%59%59%" - [ Skip steps: i=end d=end ] +@59 pass in on lo0 all flags S/SA label "%59%59%" + [ Skip steps: i=end r=end d=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@60 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA keep state 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 ] +@60 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf47.ok b/regress/sbin/pfctl/pf47.ok index fb9e6e3c158..010043a9e04 100644 --- a/regress/sbin/pfctl/pf47.ok +++ b/regress/sbin/pfctl/pf47.ok @@ -1,61 +1,61 @@ -pass in on lo0 all flags S/SA keep state -pass in all flags S/SA keep state label "any" -pass in on lo0 all flags S/SA keep state label "lo0" -pass in on lo0 all flags S/SA keep state label "lo0lo0" -pass in on lo0 all flags S/SA keep state label "any" -pass in on lo0 inet all flags S/SA keep state label "any" -pass in on lo0 inet from 127.0.0.1 to any flags S/SA keep state label "127.0.0.1" -pass in on lo0 inet from 127.0.0.1 to any flags S/SA keep state label "127.0.0.1127.0.0.1" -pass in on lo0 inet from 127.0.0.1 to any flags S/SA keep state label ":127.0.0.1:127.0.0.1:" -pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA keep state label "127.0.0.0/8" -pass in on lo0 inet from 127.0.0.0/16 to any flags S/SA keep state label "127.0.0.0/16127.0.0.0/16" -pass in on lo0 inet from 127.0.0.0/31 to any flags S/SA keep state label ":127.0.0.0/31:127.0.0.0/31:" -pass in on lo0 inet6 from fe80::1 to any flags S/SA keep state label "fe80::1" -pass in on lo0 inet6 from fe80::1 to any flags S/SA keep state label "fe80::1fe80::1" -pass in on lo0 inet6 from fe80::1 to any flags S/SA keep state label ":fe80::1:fe80::1:" -pass in on lo0 inet6 from ::/8 to any flags S/SA keep state label "::/8" -pass in on lo0 inet6 from fe00::/8 to any flags S/SA keep state label "fe00::/8" -pass in on lo0 inet6 from ::/64 to any flags S/SA keep state label "::/64::/64" -pass in on lo0 inet6 from fe80::/64 to any flags S/SA keep state label "fe80::/64fe80::/64" -pass in on lo0 inet6 from ::/127 to any flags S/SA keep state label ":::/127:::/127:" -pass in on lo0 inet6 from fe80::/127 to any flags S/SA keep state label ":fe80::/127:fe80::/127:" -pass in on lo0 all flags S/SA keep state label "!any!" -pass in on lo0 inet from any to (lo0) flags S/SA keep state label "(lo0)" -pass in on lo0 inet from any to (lo0) flags S/SA keep state label "(lo0)(lo0)" -pass in on lo0 inet from any to (lo0) flags S/SA keep state label " (lo0) (lo0) " -pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA keep state label "! 127.0.0.0/8" -pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA keep state label "! 127.0.0.0/16! 127.0.0.0/16" -pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA keep state label " ! 127.0.0.0/31 ! 127.0.0.0/31 " -pass in on lo0 inet6 from any to ! (lo0) flags S/SA keep state label "! (lo0)" -pass in on lo0 inet6 from any to ! (lo0) flags S/SA keep state label "! (lo0)! (lo0)" -pass in on lo0 inet6 from any to ! (lo0) flags S/SA keep state label " ! (lo0) ! (lo0) " -pass in on lo0 inet6 from any to ! ::/8 flags S/SA keep state label "! ::/8" -pass in on lo0 inet6 from any to ! ::/64 flags S/SA keep state label "! ::/64! ::/64" -pass in on lo0 inet6 from any to ! ::/127 flags S/SA keep state label " ! ::/127 ! ::/127 " -pass in on lo0 all flags S/SA keep state label "xx" -pass in on lo0 proto tcp from any port = 28 to any flags S/SA keep state label "28" -pass in on lo0 proto tcp from any port 28 >< 29 to any flags S/SA keep state label "28><29" -pass in on lo0 proto tcp from any port 28 <> 29 to any flags S/SA keep state label "28<>29" -pass in on lo0 proto tcp from any port 28:29 to any flags S/SA keep state -pass in on lo0 proto tcp from any port != 28 to any flags S/SA keep state label "!=28" -pass in on lo0 proto tcp from any port < 28 to any flags S/SA keep state label "<28" -pass in on lo0 proto tcp from any port <= 28 to any flags S/SA keep state label "<=28" -pass in on lo0 proto tcp from any port > 28 to any flags S/SA keep state label ">28" -pass in on lo0 proto tcp from any port >= 28 to any flags S/SA keep state label ">=28" -pass in on lo0 proto tcp from any port = 28 to any flags S/SA keep state label "2828" -pass in on lo0 proto tcp from any port = 28 to any flags S/SA keep state label "$28$28$" -pass in on lo0 all flags S/SA keep state -pass in on lo0 proto udp from any to any port = 29 keep state label "29" -pass in on lo0 proto udp from any to any port != 29 keep state label "!=29!=29" -pass in on lo0 proto udp from any to any port > 29 keep state label "x>29x>29x" -pass in on lo0 all flags S/SA keep state label "ip" -pass in on lo0 proto esp all keep state label "esp" -pass in on lo0 proto esp all keep state label "espesp" -pass in on lo0 proto esp all keep state label "-esp-esp-" -pass in on lo0 proto 166 all keep state label "166" -pass in on lo0 proto 166 all keep state label "166166" -pass in on lo0 proto 166 all keep state label "_166_166_" -pass in on lo0 all flags S/SA keep state label "57" -pass in on lo0 all flags S/SA keep state label "5858" -pass in on lo0 all flags S/SA keep state label "%59%59%" -pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA keep state label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44" +pass in on lo0 all flags S/SA +pass in all flags S/SA label "any" +pass in on lo0 all flags S/SA label "lo0" +pass in on lo0 all flags S/SA label "lo0lo0" +pass in on lo0 all flags S/SA label "any" +pass in on lo0 inet all flags S/SA label "any" +pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1" +pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1127.0.0.1" +pass in on lo0 inet from 127.0.0.1 to any flags S/SA label ":127.0.0.1:127.0.0.1:" +pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA label "127.0.0.0/8" +pass in on lo0 inet from 127.0.0.0/16 to any flags S/SA label "127.0.0.0/16127.0.0.0/16" +pass in on lo0 inet from 127.0.0.0/31 to any flags S/SA label ":127.0.0.0/31:127.0.0.0/31:" +pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1" +pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1fe80::1" +pass in on lo0 inet6 from fe80::1 to any flags S/SA label ":fe80::1:fe80::1:" +pass in on lo0 inet6 from ::/8 to any flags S/SA label "::/8" +pass in on lo0 inet6 from fe00::/8 to any flags S/SA label "fe00::/8" +pass in on lo0 inet6 from ::/64 to any flags S/SA label "::/64::/64" +pass in on lo0 inet6 from fe80::/64 to any flags S/SA label "fe80::/64fe80::/64" +pass in on lo0 inet6 from ::/127 to any flags S/SA label ":::/127:::/127:" +pass in on lo0 inet6 from fe80::/127 to any flags S/SA label ":fe80::/127:fe80::/127:" +pass in on lo0 all flags S/SA label "!any!" +pass in on lo0 inet from any to (lo0) flags S/SA label "(lo0)" +pass in on lo0 inet from any to (lo0) flags S/SA label "(lo0)(lo0)" +pass in on lo0 inet from any to (lo0) flags S/SA label " (lo0) (lo0) " +pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA label "! 127.0.0.0/8" +pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA label "! 127.0.0.0/16! 127.0.0.0/16" +pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA label " ! 127.0.0.0/31 ! 127.0.0.0/31 " +pass in on lo0 inet6 from any to ! (lo0) flags S/SA label "! (lo0)" +pass in on lo0 inet6 from any to ! (lo0) flags S/SA label "! (lo0)! (lo0)" +pass in on lo0 inet6 from any to ! (lo0) flags S/SA label " ! (lo0) ! (lo0) " +pass in on lo0 inet6 from any to ! ::/8 flags S/SA label "! ::/8" +pass in on lo0 inet6 from any to ! ::/64 flags S/SA label "! ::/64! ::/64" +pass in on lo0 inet6 from any to ! ::/127 flags S/SA label " ! ::/127 ! ::/127 " +pass in on lo0 all flags S/SA label "xx" +pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "28" +pass in on lo0 proto tcp from any port 28 >< 29 to any flags S/SA label "28><29" +pass in on lo0 proto tcp from any port 28 <> 29 to any flags S/SA label "28<>29" +pass in on lo0 proto tcp from any port 28:29 to any flags S/SA +pass in on lo0 proto tcp from any port != 28 to any flags S/SA label "!=28" +pass in on lo0 proto tcp from any port < 28 to any flags S/SA label "<28" +pass in on lo0 proto tcp from any port <= 28 to any flags S/SA label "<=28" +pass in on lo0 proto tcp from any port > 28 to any flags S/SA label ">28" +pass in on lo0 proto tcp from any port >= 28 to any flags S/SA label ">=28" +pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "2828" +pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "$28$28$" +pass in on lo0 all flags S/SA +pass in on lo0 proto udp from any to any port = 29 label "29" +pass in on lo0 proto udp from any to any port != 29 label "!=29!=29" +pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x" +pass in on lo0 all flags S/SA label "ip" +pass in on lo0 proto esp all label "esp" +pass in on lo0 proto esp all label "espesp" +pass in on lo0 proto esp all label "-esp-esp-" +pass in on lo0 proto 166 all label "166" +pass in on lo0 proto 166 all label "166166" +pass in on lo0 proto 166 all label "_166_166_" +pass in on lo0 all flags S/SA label "57" +pass in on lo0 all flags S/SA label "5858" +pass in on lo0 all flags S/SA label "%59%59%" +pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44" diff --git a/regress/sbin/pfctl/pf47.optimized b/regress/sbin/pfctl/pf47.optimized index cdbc89021e9..a4af4257e3b 100644 --- a/regress/sbin/pfctl/pf47.optimized +++ b/regress/sbin/pfctl/pf47.optimized @@ -1,244 +1,244 @@ -@0 pass in on lo0 all flags S/SA keep state - [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@0 pass in on lo0 all flags S/SA + [ Skip steps: r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in all flags S/SA keep state label "any" - [ Skip steps: d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@1 pass in all flags S/SA label "any" + [ Skip steps: r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo0 all flags S/SA keep state label "lo0" - [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@2 pass in on lo0 all flags S/SA label "lo0" + [ Skip steps: i=end r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo0 all flags S/SA keep state label "lo0lo0" - [ Skip steps: i=end d=end f=5 p=35 sa=6 sp=35 da=22 dp=47 ] +@3 pass in on lo0 all flags S/SA label "lo0lo0" + [ Skip steps: i=end r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo0 all flags S/SA keep state label "any" - [ Skip steps: i=end d=end p=35 sa=6 sp=35 da=22 dp=47 ] +@4 pass in on lo0 all flags S/SA label "any" + [ Skip steps: i=end r=end d=end p=35 sa=6 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in on lo0 inet all flags S/SA keep state label "any" - [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ] +@5 pass in on lo0 inet all flags S/SA label "any" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "127.0.0.1" - [ Skip steps: i=end d=end f=12 p=35 sa=9 sp=35 da=22 dp=47 ] +@6 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1" + [ Skip steps: i=end r=end d=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state 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=47 ] +@7 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1127.0.0.1" + [ Skip steps: i=end r=end d=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":127.0.0.1:127.0.0.1:" - [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ] +@8 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label ":127.0.0.1:127.0.0.1:" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "127.0.0.0/8" - [ Skip steps: i=end d=end f=12 p=35 sp=35 da=22 dp=47 ] +@9 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA label "127.0.0.0/8" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state 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=47 ] +@10 pass in on lo0 inet from 127.0.0.0/16 to any flags S/SA label "127.0.0.0/16127.0.0.0/16" + [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":127.0.0.0/31:127.0.0.0/31:" - [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=47 ] +@11 pass in on lo0 inet from 127.0.0.0/31 to any flags S/SA label ":127.0.0.0/31:127.0.0.0/31:" + [ Skip steps: i=end r=end d=end p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe80::1" - [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=47 ] +@12 pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1" + [ Skip steps: i=end r=end d=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe80::1fe80::1" - [ Skip steps: i=end d=end f=21 p=35 sa=15 sp=35 da=22 dp=47 ] +@13 pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1fe80::1" + [ Skip steps: i=end r=end d=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":fe80::1:fe80::1:" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@14 pass in on lo0 inet6 from fe80::1 to any flags S/SA label ":fe80::1:fe80::1:" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "::/8" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@15 pass in on lo0 inet6 from ::/8 to any flags S/SA label "::/8" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe00::/8" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@16 pass in on lo0 inet6 from fe00::/8 to any flags S/SA label "fe00::/8" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "::/64::/64" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@17 pass in on lo0 inet6 from ::/64 to any flags S/SA label "::/64::/64" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label "fe80::/64fe80::/64" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@18 pass in on lo0 inet6 from fe80::/64 to any flags S/SA label "fe80::/64fe80::/64" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":::/127:::/127:" - [ Skip steps: i=end d=end f=21 p=35 sp=35 da=22 dp=47 ] +@19 pass in on lo0 inet6 from ::/127 to any flags S/SA label ":::/127:::/127:" + [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ] [ 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 flags S/SA keep state label ":fe80::/127:fe80::/127:" - [ Skip steps: i=end d=end p=35 sp=35 da=22 dp=47 ] +@20 pass in on lo0 inet6 from fe80::/127 to any flags S/SA label ":fe80::/127:fe80::/127:" + [ Skip steps: i=end r=end d=end p=35 da=22 sp=35 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on lo0 all flags S/SA keep state label "!any!" - [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] +@21 pass in on lo0 all flags S/SA label "!any!" + [ Skip steps: i=end r=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:1) flags S/SA keep state label "(lo0)" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ] +@22 pass in on lo0 inet from any to (lo0:1) flags S/SA label "(lo0)" + [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 da=25 sp=35 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:1) flags S/SA keep state label "(lo0)(lo0)" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 da=25 dp=47 ] +@23 pass in on lo0 inet from any to (lo0:1) flags S/SA label "(lo0)(lo0)" + [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 da=25 sp=35 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:1) flags S/SA keep state label " (lo0) (lo0) " - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] +@24 pass in on lo0 inet from any to (lo0:1) flags S/SA label " (lo0) (lo0) " + [ Skip steps: i=end r=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 ] -@25 pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA keep state label "! 127.0.0.0/8" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] +@25 pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA label "! 127.0.0.0/8" + [ Skip steps: i=end r=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 ] -@26 pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA keep state label "! 127.0.0.0/16! 127.0.0.0/16" - [ Skip steps: i=end d=end f=28 p=35 sa=60 sp=35 dp=47 ] +@26 pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA label "! 127.0.0.0/16! 127.0.0.0/16" + [ Skip steps: i=end r=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 ] -@27 pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA keep state label " ! 127.0.0.0/31 ! 127.0.0.0/31 " - [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] +@27 pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA label " ! 127.0.0.0/31 ! 127.0.0.0/31 " + [ Skip steps: i=end r=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:2) flags S/SA keep state label "! (lo0)" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ] +@28 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label "! (lo0)" + [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 da=31 sp=35 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:2) flags S/SA keep state label "! (lo0)! (lo0)" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 da=31 dp=47 ] +@29 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label "! (lo0)! (lo0)" + [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 da=31 sp=35 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:2) flags S/SA keep state label " ! (lo0) ! (lo0) " - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] +@30 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label " ! (lo0) ! (lo0) " + [ Skip steps: i=end r=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 ] -@31 pass in on lo0 inet6 from any to ! ::/8 flags S/SA keep state label "! ::/8" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] +@31 pass in on lo0 inet6 from any to ! ::/8 flags S/SA label "! ::/8" + [ Skip steps: i=end r=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 ] -@32 pass in on lo0 inet6 from any to ! ::/64 flags S/SA keep state label "! ::/64! ::/64" - [ Skip steps: i=end d=end f=34 p=35 sa=60 sp=35 dp=47 ] +@32 pass in on lo0 inet6 from any to ! ::/64 flags S/SA label "! ::/64! ::/64" + [ Skip steps: i=end r=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 ] -@33 pass in on lo0 inet6 from any to ! ::/127 flags S/SA keep state label " ! ::/127 ! ::/127 " - [ Skip steps: i=end d=end p=35 sa=60 sp=35 dp=47 ] +@33 pass in on lo0 inet6 from any to ! ::/127 flags S/SA label " ! ::/127 ! ::/127 " + [ Skip steps: i=end r=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 ] -@34 pass in on lo0 all flags S/SA keep state label "xx" - [ Skip steps: i=end d=end f=60 sa=60 da=60 dp=47 ] +@34 pass in on lo0 all flags S/SA label "xx" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@35 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "28><29" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@36 pass in on lo0 proto tcp from any port 28 >< 29 to any flags S/SA label "28><29" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "28<>29" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@37 pass in on lo0 proto tcp from any port 28 <> 29 to any flags S/SA label "28<>29" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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:29 to any flags S/SA keep state - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@38 pass in on lo0 proto tcp from any port 28:29 to any flags S/SA + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "!=28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@39 pass in on lo0 proto tcp from any port != 28 to any flags S/SA label "!=28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "<28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@40 pass in on lo0 proto tcp from any port < 28 to any flags S/SA label "<28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "<=28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@41 pass in on lo0 proto tcp from any port <= 28 to any flags S/SA label "<=28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label ">28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@42 pass in on lo0 proto tcp from any port > 28 to any flags S/SA label ">28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label ">=28" - [ Skip steps: i=end d=end f=60 p=46 sa=60 da=60 dp=47 ] +@43 pass in on lo0 proto tcp from any port >= 28 to any flags S/SA label ">=28" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ] [ 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 flags S/SA keep state label "2828" - [ Skip steps: i=end d=end f=60 p=46 sa=60 sp=46 da=60 dp=47 ] +@44 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "2828" + [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 sp=46 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@45 pass in on lo0 proto tcp from any port = 28 to any flags S/SA keep state label "$28$28$" - [ Skip steps: i=end d=end f=60 sa=60 da=60 dp=47 ] +@45 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "$28$28$" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 dp=47 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 pass in on lo0 all flags S/SA keep state - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 ] +@46 pass in on lo0 all flags S/SA + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 ] [ 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 keep state label "29" - [ Skip steps: i=end d=end f=60 p=50 sa=60 sp=60 da=60 ] +@47 pass in on lo0 proto udp from any to any port = 29 label "29" + [ Skip steps: i=end r=end d=end f=60 p=50 sa=60 da=60 sp=60 ] [ 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 keep state label "!=29!=29" - [ Skip steps: i=end d=end f=60 p=50 sa=60 sp=60 da=60 ] +@48 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29" + [ Skip steps: i=end r=end d=end f=60 p=50 sa=60 da=60 sp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@49 pass in on lo0 proto udp from any to any port > 29 keep state label "x>29x>29x" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 ] +@49 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@50 pass in on lo0 all flags S/SA keep state label "ip" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ] +@50 pass in on lo0 all flags S/SA label "ip" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@51 pass in on lo0 proto esp all keep state label "esp" - [ Skip steps: i=end d=end f=60 p=54 sa=60 sp=60 da=60 dp=60 ] +@51 pass in on lo0 proto esp all label "esp" + [ Skip steps: i=end r=end d=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@52 pass in on lo0 proto esp all keep state label "espesp" - [ Skip steps: i=end d=end f=60 p=54 sa=60 sp=60 da=60 dp=60 ] +@52 pass in on lo0 proto esp all label "espesp" + [ Skip steps: i=end r=end d=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@53 pass in on lo0 proto esp all keep state label "-esp-esp-" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ] +@53 pass in on lo0 proto esp all label "-esp-esp-" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@54 pass in on lo0 proto 166 all keep state label "166" - [ Skip steps: i=end d=end f=60 p=57 sa=60 sp=60 da=60 dp=60 ] +@54 pass in on lo0 proto 166 all label "166" + [ Skip steps: i=end r=end d=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@55 pass in on lo0 proto 166 all keep state label "166166" - [ Skip steps: i=end d=end f=60 p=57 sa=60 sp=60 da=60 dp=60 ] +@55 pass in on lo0 proto 166 all label "166166" + [ Skip steps: i=end r=end d=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@56 pass in on lo0 proto 166 all keep state label "_166_166_" - [ Skip steps: i=end d=end f=60 sa=60 sp=60 da=60 dp=60 ] +@56 pass in on lo0 proto 166 all label "_166_166_" + [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@57 pass in on lo0 all flags S/SA keep state label "57" - [ Skip steps: i=end d=end f=60 p=60 sa=60 sp=60 da=60 dp=60 ] +@57 pass in on lo0 all flags S/SA label "57" + [ Skip steps: i=end r=end d=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@58 pass in on lo0 all flags S/SA keep state label "5858" - [ Skip steps: i=end d=end f=60 p=60 sa=60 sp=60 da=60 dp=60 ] +@58 pass in on lo0 all flags S/SA label "5858" + [ Skip steps: i=end r=end d=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@59 pass in on lo0 all flags S/SA keep state label "%59%59%" - [ Skip steps: i=end d=end ] +@59 pass in on lo0 all flags S/SA label "%59%59%" + [ Skip steps: i=end r=end d=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@60 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA keep state 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 ] +@60 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf48.in b/regress/sbin/pfctl/pf48.in index 943970980d9..540711adf78 100644 --- a/regress/sbin/pfctl/pf48.in +++ b/regress/sbin/pfctl/pf48.in @@ -1,10 +1,10 @@ table < regress > { 1.2.3.4 !5.6.7.8 10/8 lo0 } table <regress.1> const { ::1 fe80::/64 } table <regress.a> { 1.2.3.4 !5.6.7.8 } { ::1 ::2 ::3 } file "/dev/null" const { 4.3.2.1 } -match out on lo0 from < regress.1> to <regress.2> nat-to lo0 -match out on !lo0 from !<regress.1 > to <regress.2> nat-to lo0 -match in on lo0 from <regress.1> to <regress.2> rdr-to lo0 -match in on !lo0 from !< regress.1 > to <regress.2> rdr-to lo0 +match out on lo0 from < regress.1> to <regress.2> nat-to lo0:0 +match out on !lo0 inet from !<regress.1 > to <regress.2> nat-to lo0:0 +match in on lo0 inet6 from <regress.1> to <regress.2> rdr-to lo0:0 +match in on !lo0 from !< regress.1 > to <regress.2> rdr-to lo0:0 match in from { <regress.1> !<regress.2> } to any match out from any to { !<regress.1>, <regress.2> } pass in from <regress> to any diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded index a3ce438ba56..d797b2aec82 100644 --- a/regress/sbin/pfctl/pf48.loaded +++ b/regress/sbin/pfctl/pf48.loaded @@ -1,56 +1,56 @@ -@0 match out on lo0 inet from <regress.1:2> to <regress.2:*> nat-to 127.0.0.1 - [ Skip steps: d=2 f=4 p=end sp=end da=4 dp=end ] +@0 match out on lo0 inet6 from <regress.1:2> to <regress.2:*> nat-to ::1 + [ Skip steps: r=2 p=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on ! lo0 inet from ! <regress.1:2> to <regress.2:*> nat-to 127.0.0.1 - [ Skip steps: f=4 p=end sp=end da=4 dp=end ] + [ Skip steps: p=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 match in on lo0 inet from <regress.1:2> to <regress.2:*> rdr-to 127.0.0.1 - [ Skip steps: d=6 f=4 p=end sp=end da=4 dp=end ] +@2 match in on lo0 inet6 from <regress.1:2> to <regress.2:*> rdr-to ::1 + [ Skip steps: r=6 f=4 p=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 match in on ! lo0 inet from ! <regress.1:2> to <regress.2:*> rdr-to 127.0.0.1 - [ Skip steps: d=6 p=end sp=end dp=end ] +@3 match in on ! lo0 inet6 from ! <regress.1:2> to <regress.2:*> rdr-to ::1 + [ Skip steps: r=6 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in from <regress.1:2> to any - [ Skip steps: i=end d=6 f=end p=end sp=end da=6 dp=end ] + [ Skip steps: i=end r=6 d=end f=end p=end da=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in from ! <regress.2:*> to any - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @6 match out from any to ! <regress.1:2> - [ Skip steps: i=end d=8 f=end p=end sa=8 sp=end dp=end ] + [ Skip steps: i=end r=8 d=end f=end p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match out from any to <regress.2:*> - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] -@8 pass in from <regress:6> to any flags S/SA keep state - [ Skip steps: i=end f=end p=end sp=end dp=end ] +@8 pass in from <regress:6> to any flags S/SA + [ 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 ] -@9 pass out from any to <regress:6> flags S/SA keep state - [ Skip steps: i=end f=end p=end sp=end dp=end ] +@9 pass out from any to <regress:6> flags S/SA + [ 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 ] -@10 pass in from <regress.1:2> to any flags S/SA keep state - [ Skip steps: i=end d=12 f=end p=end sp=end da=12 dp=end ] +@10 pass in from <regress.1:2> to any flags S/SA + [ Skip steps: i=end r=12 d=end f=end p=end da=12 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in from <regress.2:*> to any flags S/SA keep state - [ Skip steps: i=end f=end p=end sp=end dp=end ] +@11 pass in from <regress.2:*> to any flags S/SA + [ 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 ] -@12 pass out from any to ! <regress.1:2> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@12 pass out from any to ! <regress.1:2> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out from any to ! <regress.2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@13 pass out from any to ! <regress.2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf48.ok b/regress/sbin/pfctl/pf48.ok index aff5123c231..5f6e6ab7f2f 100644 --- a/regress/sbin/pfctl/pf48.ok +++ b/regress/sbin/pfctl/pf48.ok @@ -1,17 +1,17 @@ -table <regress> { 1.2.3.4 !5.6.7.8 10.0.0.0/8 127.0.0.1 ::1 fe80::1 } +table <regress> { 1.2.3.4 !5.6.7.8 10.0.0.0/8 ::1 fe80::1 127.0.0.1 } table <regress.1> const { ::1 fe80::/64 } table <regress.a> const { 1.2.3.4 !5.6.7.8 ::1 ::2 ::3 } file "/dev/null" { 4.3.2.1 } -match out on lo0 inet from <regress.1> to <regress.2> nat-to 127.0.0.1 +match out on lo0 inet6 from <regress.1> to <regress.2> nat-to ::1 match out on ! lo0 inet from ! <regress.1> to <regress.2> nat-to 127.0.0.1 -match in on lo0 inet from <regress.1> to <regress.2> rdr-to 127.0.0.1 -match in on ! lo0 inet from ! <regress.1> to <regress.2> rdr-to 127.0.0.1 +match in on lo0 inet6 from <regress.1> to <regress.2> rdr-to ::1 +match in on ! lo0 inet6 from ! <regress.1> to <regress.2> rdr-to ::1 match in from <regress.1> to any match in from ! <regress.2> to any match out from any to ! <regress.1> match out from any to <regress.2> -pass in from <regress> to any flags S/SA keep state -pass out from any to <regress> flags S/SA keep state -pass in from <regress.1> to any flags S/SA keep state -pass in from <regress.2> to any flags S/SA keep state -pass out from any to ! <regress.1> flags S/SA keep state -pass out from any to ! <regress.2> flags S/SA keep state +pass in from <regress> to any flags S/SA +pass out from any to <regress> flags S/SA +pass in from <regress.1> to any flags S/SA +pass in from <regress.2> to any flags S/SA +pass out from any to ! <regress.1> flags S/SA +pass out from any to ! <regress.2> flags S/SA diff --git a/regress/sbin/pfctl/pf48.optimized b/regress/sbin/pfctl/pf48.optimized index dbc84cefd5f..1f49efa2824 100644 --- a/regress/sbin/pfctl/pf48.optimized +++ b/regress/sbin/pfctl/pf48.optimized @@ -1,56 +1,56 @@ -@0 match out on lo0 inet from <regress.1:2> to <regress.2:*> nat-to 127.0.0.1 - [ Skip steps: d=2 f=4 p=end sp=end da=4 dp=end ] +@0 match out on lo0 inet6 from <regress.1:2> to <regress.2:*> nat-to ::1 + [ Skip steps: r=2 p=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on ! lo0 inet from ! <regress.1:2> to <regress.2:*> nat-to 127.0.0.1 - [ Skip steps: f=4 p=end sp=end da=4 dp=end ] + [ Skip steps: p=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 match in on lo0 inet from <regress.1:2> to <regress.2:*> rdr-to 127.0.0.1 - [ Skip steps: d=6 f=4 p=end sp=end da=4 dp=end ] +@2 match in on lo0 inet6 from <regress.1:2> to <regress.2:*> rdr-to ::1 + [ Skip steps: r=6 f=4 p=end da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 match in on ! lo0 inet from ! <regress.1:2> to <regress.2:*> rdr-to 127.0.0.1 - [ Skip steps: d=6 p=end sp=end dp=end ] +@3 match in on ! lo0 inet6 from ! <regress.1:2> to <regress.2:*> rdr-to ::1 + [ Skip steps: r=6 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in from <regress.1:2> to any - [ Skip steps: i=end d=6 f=end p=end sp=end da=6 dp=end ] + [ Skip steps: i=end r=6 d=end f=end p=end da=6 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in from ! <regress.2:*> to any - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @6 match out from any to ! <regress.1:2> - [ Skip steps: i=end d=8 f=end p=end sa=8 sp=end dp=end ] + [ Skip steps: i=end r=8 d=end f=end p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match out from any to <regress.2:*> - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] -@8 pass in from <regress:6> to any flags S/SA keep state - [ Skip steps: i=end d=11 f=end p=end sp=end da=11 dp=end ] +@8 pass in from <regress:6> to any flags S/SA + [ Skip steps: i=end r=11 d=end f=end p=end da=11 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in from <regress.1:2> to any flags S/SA keep state - [ Skip steps: i=end d=11 f=end p=end sp=end da=11 dp=end ] +@9 pass in from <regress.1:2> to any flags S/SA + [ Skip steps: i=end r=11 d=end f=end p=end da=11 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass in from <regress.2:*> to any flags S/SA keep state - [ Skip steps: i=end f=end p=end sp=end dp=end ] +@10 pass in from <regress.2:*> to any flags S/SA + [ 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 ] -@11 pass out from any to <regress:6> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@11 pass out from any to <regress:6> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass out from any to ! <regress.1:2> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@12 pass out from any to ! <regress.1:2> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out from any to ! <regress.2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@13 pass out from any to ! <regress.2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf49.in b/regress/sbin/pfctl/pf49.in index 420ea2df004..91b9712f7b3 100644 --- a/regress/sbin/pfctl/pf49.in +++ b/regress/sbin/pfctl/pf49.in @@ -1,5 +1,7 @@ #test :broadcast and :network modifiers pass in on lo0 from lo0:network to any keep state +pass out on lo0 inet from lo0:network to any +pass in on lo0 inet6 from lo0:network to any keep state #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 82b15ae8169..8747aa9fe20 100644 --- a/regress/sbin/pfctl/pf49.loaded +++ b/regress/sbin/pfctl/pf49.loaded @@ -1,8 +1,16 @@ -@0 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@0 pass in on lo0 inet6 from ::1 to any flags S/SA + [ Skip steps: i=end r=2 d=end p=end da=end sp=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 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA + [ Skip steps: i=end d=end f=3 p=end sa=3 da=end sp=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@2 pass out on lo0 inet from 127.0.0.0/8 to any flags S/SA + [ Skip steps: i=end d=end p=end da=end sp=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@3 pass in on lo0 inet6 from ::1 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf49.ok b/regress/sbin/pfctl/pf49.ok index 19d0d39dc9d..90c09c6362e 100644 --- a/regress/sbin/pfctl/pf49.ok +++ b/regress/sbin/pfctl/pf49.ok @@ -1,2 +1,4 @@ -pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA keep state -pass in on lo0 inet6 from ::1 to any flags S/SA keep state +pass in on lo0 inet6 from ::1 to any flags S/SA +pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA +pass out on lo0 inet from 127.0.0.0/8 to any flags S/SA +pass in on lo0 inet6 from ::1 to any flags S/SA diff --git a/regress/sbin/pfctl/pf49.optimized b/regress/sbin/pfctl/pf49.optimized index 82b15ae8169..1070d522502 100644 --- a/regress/sbin/pfctl/pf49.optimized +++ b/regress/sbin/pfctl/pf49.optimized @@ -1,8 +1,12 @@ -@0 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@0 pass in on lo0 inet6 from ::1 to any flags S/SA + [ Skip steps: i=end r=2 d=end p=end da=end sp=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 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@2 pass out on lo0 inet from 127.0.0.0/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf5.loaded b/regress/sbin/pfctl/pf5.loaded index c2b05cd45e4..175d83d0111 100644 --- a/regress/sbin/pfctl/pf5.loaded +++ b/regress/sbin/pfctl/pf5.loaded @@ -1,32 +1,32 @@ @0 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=2 da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=2 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=4 da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=6 da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=6 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf5.optimized b/regress/sbin/pfctl/pf5.optimized index 74da9bb0f58..cbb8a278898 100644 --- a/regress/sbin/pfctl/pf5.optimized +++ b/regress/sbin/pfctl/pf5.optimized @@ -1,32 +1,32 @@ @0 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end da=end dp=4 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end da=end dp=4 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end da=end dp=4 ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667 - [ Skip steps: i=end d=end f=end p=end sa=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 16 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf53.ok b/regress/sbin/pfctl/pf53.ok index 91866b724d3..29b74820334 100644 --- a/regress/sbin/pfctl/pf53.ok +++ b/regress/sbin/pfctl/pf53.ok @@ -1,4 +1,4 @@ -pass in inet proto tcp from 1.2.3.4 to any flags S/SA keep state label "0:any:tcp:1.2.3.4::any:" -pass in inet proto tcp from 1.2.3.5 to any flags S/SA keep state label "1:any:tcp:1.2.3.5::any:" -pass in on lo0 inet proto tcp from 1.2.3.4 to any flags S/SA keep state label "2:lo0:tcp:1.2.3.4::any:" -pass in on lo0 inet proto tcp from 1.2.3.5 to any flags S/SA keep state label "3:lo0:tcp:1.2.3.5::any:" +pass in inet proto tcp from 1.2.3.4 to any flags S/SA label "0:any:tcp:1.2.3.4::any:" +pass in inet proto tcp from 1.2.3.5 to any flags S/SA label "1:any:tcp:1.2.3.5::any:" +pass in on lo0 inet proto tcp from 1.2.3.4 to any flags S/SA label "2:lo0:tcp:1.2.3.4::any:" +pass in on lo0 inet proto tcp from 1.2.3.5 to any flags S/SA label "3:lo0:tcp:1.2.3.5::any:" diff --git a/regress/sbin/pfctl/pf54.loaded b/regress/sbin/pfctl/pf54.loaded index 2794e743e45..64c559232b4 100644 --- a/regress/sbin/pfctl/pf54.loaded +++ b/regress/sbin/pfctl/pf54.loaded @@ -1,4 +1,4 @@ @0 match all scrub (random-id) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf54.optimized b/regress/sbin/pfctl/pf54.optimized index 2794e743e45..64c559232b4 100644 --- a/regress/sbin/pfctl/pf54.optimized +++ b/regress/sbin/pfctl/pf54.optimized @@ -1,4 +1,4 @@ @0 match all scrub (random-id) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf56.loaded b/regress/sbin/pfctl/pf56.loaded index c51fb09bba6..2ecd0d2e637 100644 --- a/regress/sbin/pfctl/pf56.loaded +++ b/regress/sbin/pfctl/pf56.loaded @@ -1,8 +1,8 @@ @0 pass in proto tcp from any to any port = www flags S/SA keep state (tcp.established 60) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in proto tcp from any to any port = www flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf56.optimized b/regress/sbin/pfctl/pf56.optimized index c51fb09bba6..2ecd0d2e637 100644 --- a/regress/sbin/pfctl/pf56.optimized +++ b/regress/sbin/pfctl/pf56.optimized @@ -1,8 +1,8 @@ @0 pass in proto tcp from any to any port = www flags S/SA keep state (tcp.established 60) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in proto tcp from any to any port = www flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf57.ok b/regress/sbin/pfctl/pf57.ok index 23299e28518..f4aa0d8d602 100644 --- a/regress/sbin/pfctl/pf57.ok +++ b/regress/sbin/pfctl/pf57.ok @@ -1,4 +1,4 @@ a = "10.0.0.1" b = "x" b = "y" -pass in inet from 10.0.0.1 to any flags S/SA keep state +pass in inet from 10.0.0.1 to any flags S/SA diff --git a/regress/sbin/pfctl/pf60.loaded b/regress/sbin/pfctl/pf60.loaded index 643bc77002a..bfd4763754b 100644 --- a/regress/sbin/pfctl/pf60.loaded +++ b/regress/sbin/pfctl/pf60.loaded @@ -1,28 +1,28 @@ -@0 pass inet from 224.4.5.4 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@0 pass inet from 224.4.5.4 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet from 224.4.0.0/16 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@1 pass inet from 224.4.0.0/16 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet from 224.4.5.0/26 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@2 pass inet from 224.4.5.0/26 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet from 224.4.5.64/26 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@3 pass inet from 224.4.5.64/26 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass inet from 224.4.5.128/26 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@4 pass inet from 224.4.5.128/26 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass inet from 224.4.5.192/26 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@5 pass inet from 224.4.5.192/26 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass inet from 224.4.5.4 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@6 pass inet from 224.4.5.4 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf60.ok b/regress/sbin/pfctl/pf60.ok index f0cd27039fe..87261a324be 100644 --- a/regress/sbin/pfctl/pf60.ok +++ b/regress/sbin/pfctl/pf60.ok @@ -1,7 +1,7 @@ -pass inet from 224.4.5.4 to any flags S/SA keep state -pass inet from 224.4.0.0/16 to any flags S/SA keep state -pass inet from 224.4.5.0/26 to any flags S/SA keep state -pass inet from 224.4.5.64/26 to any flags S/SA keep state -pass inet from 224.4.5.128/26 to any flags S/SA keep state -pass inet from 224.4.5.192/26 to any flags S/SA keep state -pass inet from 224.4.5.4 to any flags S/SA keep state +pass inet from 224.4.5.4 to any flags S/SA +pass inet from 224.4.0.0/16 to any flags S/SA +pass inet from 224.4.5.0/26 to any flags S/SA +pass inet from 224.4.5.64/26 to any flags S/SA +pass inet from 224.4.5.128/26 to any flags S/SA +pass inet from 224.4.5.192/26 to any flags S/SA +pass inet from 224.4.5.4 to any flags S/SA diff --git a/regress/sbin/pfctl/pf60.optimized b/regress/sbin/pfctl/pf60.optimized index a36fa2bca21..3e500747af8 100644 --- a/regress/sbin/pfctl/pf60.optimized +++ b/regress/sbin/pfctl/pf60.optimized @@ -1,4 +1,4 @@ -@0 pass inet from 224.4.0.0/16 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass inet from 224.4.0.0/16 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf61.loaded b/regress/sbin/pfctl/pf61.loaded index 800ad3931d1..a4fe4902fa4 100644 --- a/regress/sbin/pfctl/pf61.loaded +++ b/regress/sbin/pfctl/pf61.loaded @@ -1,4 +1,4 @@ -@0 pass inet from any to (lo0:1)/24 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass inet from any to (lo0:1)/24 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf61.ok b/regress/sbin/pfctl/pf61.ok index f28451aa473..13fcd3f8671 100644 --- a/regress/sbin/pfctl/pf61.ok +++ b/regress/sbin/pfctl/pf61.ok @@ -1 +1 @@ -pass inet from any to (lo0)/24 flags S/SA keep state +pass inet from any to (lo0)/24 flags S/SA diff --git a/regress/sbin/pfctl/pf61.optimized b/regress/sbin/pfctl/pf61.optimized index 800ad3931d1..a4fe4902fa4 100644 --- a/regress/sbin/pfctl/pf61.optimized +++ b/regress/sbin/pfctl/pf61.optimized @@ -1,4 +1,4 @@ -@0 pass inet from any to (lo0:1)/24 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass inet from any to (lo0:1)/24 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf65.loaded b/regress/sbin/pfctl/pf65.loaded index a024ff7c6e9..fb953ab20bf 100644 --- a/regress/sbin/pfctl/pf65.loaded +++ b/regress/sbin/pfctl/pf65.loaded @@ -1,12 +1,12 @@ -@0 block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0" - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@0 block drop in on ! lo0 inet6 from ::1 to any label "antispoof-lo0" + [ Skip steps: i=end r=end d=end p=end da=end sp=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 label "antispoof-lo0" - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@1 block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=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 label "antispoof-lo0-2" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf65.ok b/regress/sbin/pfctl/pf65.ok index 69747452bd6..eaef6485bcd 100644 --- a/regress/sbin/pfctl/pf65.ok +++ b/regress/sbin/pfctl/pf65.ok @@ -1,3 +1,3 @@ -block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0" block drop in on ! lo0 inet6 from ::1 to any label "antispoof-lo0" +block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0" block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0-2" diff --git a/regress/sbin/pfctl/pf65.optimized b/regress/sbin/pfctl/pf65.optimized index a024ff7c6e9..fb953ab20bf 100644 --- a/regress/sbin/pfctl/pf65.optimized +++ b/regress/sbin/pfctl/pf65.optimized @@ -1,12 +1,12 @@ -@0 block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0" - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@0 block drop in on ! lo0 inet6 from ::1 to any label "antispoof-lo0" + [ Skip steps: i=end r=end d=end p=end da=end sp=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 label "antispoof-lo0" - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@1 block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=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 label "antispoof-lo0-2" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf66.loaded b/regress/sbin/pfctl/pf66.loaded index 6bd8c3c3119..53e4010c447 100644 --- a/regress/sbin/pfctl/pf66.loaded +++ b/regress/sbin/pfctl/pf66.loaded @@ -1,24 +1,24 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 port 500 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 port 1000:5000 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 port 5000:1000 - [ Skip steps: i=end d=end f=end p=4 sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=4 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet proto udp from 192.168.1.4 to any nat-to 10.0.0.4 port 50000 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 port 80:5000 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 port 5000:80 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf66.optimized b/regress/sbin/pfctl/pf66.optimized index 6bd8c3c3119..53e4010c447 100644 --- a/regress/sbin/pfctl/pf66.optimized +++ b/regress/sbin/pfctl/pf66.optimized @@ -1,24 +1,24 @@ @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 port 500 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 port 1000:5000 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 port 5000:1000 - [ Skip steps: i=end d=end f=end p=4 sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=4 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match out on lo0 inet proto udp from 192.168.1.4 to any nat-to 10.0.0.4 port 50000 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 port 80:5000 - [ Skip steps: i=end d=end f=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 port 5000:80 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf67.loaded b/regress/sbin/pfctl/pf67.loaded index d8ef5b25e9e..7911a113c54 100644 --- a/regress/sbin/pfctl/pf67.loaded +++ b/regress/sbin/pfctl/pf67.loaded @@ -1,8 +1,8 @@ -@0 pass in quick on tun1000000 all flags S/SA keep state tag regress - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in quick on tun1000000 all flags S/SA tag regress + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out quick on lo0 all flags S/SA keep state tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass out quick on lo0 all flags S/SA tagged regress + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf67.ok b/regress/sbin/pfctl/pf67.ok index 4b09611f9a0..7cdd45d3ed9 100644 --- a/regress/sbin/pfctl/pf67.ok +++ b/regress/sbin/pfctl/pf67.ok @@ -1,2 +1,2 @@ -pass in quick on tun1000000 all flags S/SA keep state tag regress -pass out quick on lo0 all flags S/SA keep state tagged regress +pass in quick on tun1000000 all flags S/SA tag regress +pass out quick on lo0 all flags S/SA tagged regress diff --git a/regress/sbin/pfctl/pf67.optimized b/regress/sbin/pfctl/pf67.optimized index d8ef5b25e9e..7911a113c54 100644 --- a/regress/sbin/pfctl/pf67.optimized +++ b/regress/sbin/pfctl/pf67.optimized @@ -1,8 +1,8 @@ -@0 pass in quick on tun1000000 all flags S/SA keep state tag regress - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in quick on tun1000000 all flags S/SA tag regress + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out quick on lo0 all flags S/SA keep state tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass out quick on lo0 all flags S/SA tagged regress + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf68.loaded b/regress/sbin/pfctl/pf68.loaded index addbae1904b..f9460827bce 100644 --- a/regress/sbin/pfctl/pf68.loaded +++ b/regress/sbin/pfctl/pf68.loaded @@ -1,248 +1,248 @@ @0 match on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = www - [ Skip steps: d=4 p=end da=9 ] + [ Skip steps: r=4 d=end p=end da=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match proto tcp all - [ Skip steps: i=13 d=4 f=9 p=end sa=7 sp=39 da=9 dp=31 ] + [ Skip steps: i=13 r=4 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match proto tcp all - [ Skip steps: i=13 d=4 f=9 p=end sa=7 sp=39 da=9 dp=31 ] + [ Skip steps: i=13 r=4 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match proto tcp all - [ Skip steps: i=13 f=9 p=end sa=7 sp=39 da=9 dp=31 ] + [ Skip steps: i=13 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in proto tcp all - [ Skip steps: i=13 d=25 f=9 p=end sa=7 sp=39 da=9 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in proto tcp all - [ Skip steps: i=13 d=25 f=9 p=end sa=7 sp=39 da=9 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match in proto tcp all scrub (reassemble tcp) - [ Skip steps: i=13 d=25 f=9 p=end sp=39 da=9 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=9 p=end da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match in proto tcp from <regress.1:*> to any - [ Skip steps: i=13 d=25 f=9 p=end sp=39 da=9 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=9 p=end da=9 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match in proto tcp from ! <regress.2:*> to any - [ Skip steps: i=13 d=25 p=end sp=39 dp=31 ] + [ Skip steps: i=13 r=25 d=end p=end sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in inet proto tcp from 10.0.0.1 to 10.0.0.3 - [ Skip steps: i=13 d=25 f=13 p=end sa=11 sp=39 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=13 p=end sa=11 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 match in inet proto tcp from 10.0.0.1 to 10.0.0.4 - [ Skip steps: i=13 d=25 f=13 p=end sp=39 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=13 p=end sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match in inet proto tcp from 10.0.0.2 to 10.0.0.3 - [ Skip steps: i=13 d=25 f=13 p=end sa=13 sp=39 dp=31 ] + [ Skip steps: i=13 r=25 d=end f=13 p=end sa=13 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match in inet proto tcp from 10.0.0.2 to 10.0.0.4 - [ Skip steps: d=25 p=end sp=39 dp=31 ] + [ Skip steps: r=25 d=end p=end sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match in log on lo0 proto tcp all scrub (min-ttl 25) - [ Skip steps: i=17 d=25 p=end sp=39 dp=31 ] + [ Skip steps: i=17 r=25 d=end p=end sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match in log on lo0 inet6 proto tcp from (lo1000000:*) to 2000::1 - [ Skip steps: i=17 d=25 f=16 p=end sp=39 da=16 dp=31 ] + [ Skip steps: i=17 r=25 d=end f=16 p=end da=16 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 match in log on lo0 inet6 proto tcp from (lo0:2) to 2000::1 - [ Skip steps: i=17 d=25 p=end sp=39 dp=31 ] + [ Skip steps: i=17 r=25 d=end p=end sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 match in log on lo0 proto tcp all - [ Skip steps: d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 match in log on lo1000000 proto tcp all - [ Skip steps: d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 match in on lo0 proto tcp all - [ Skip steps: i=26 d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=26 d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 match in on lo0 proto tcp all scrub (max-mss 224) - [ Skip steps: i=26 d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=26 d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 match in on lo0 proto tcp all scrub (no-df) - [ Skip steps: i=26 d=25 f=24 p=end sa=24 sp=39 da=27 dp=31 ] + [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=26 d=25 p=end sp=39 da=27 dp=31 ] + [ Skip steps: i=26 r=25 d=end p=end da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 match in on lo0 inet proto tcp from (lo0:1) to any - [ Skip steps: i=26 p=end sp=39 da=27 dp=31 ] + [ Skip steps: i=26 d=end p=end da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 match on lo0 proto tcp all scrub (max-mss 224) - [ Skip steps: f=29 p=end sa=32 sp=39 da=27 dp=31 ] + [ Skip steps: d=end f=29 p=end sa=32 da=27 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 match out proto tcp all - [ Skip steps: i=29 d=30 f=29 p=end sa=32 sp=39 dp=31 ] + [ Skip steps: i=29 r=30 d=end f=29 p=end sa=32 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 match out proto tcp from any to ! <regress.1:*> - [ Skip steps: i=29 d=30 f=29 p=end sa=32 sp=39 dp=31 ] + [ Skip steps: i=29 r=30 d=end f=29 p=end sa=32 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 match out proto tcp from any to <regress.2:*> - [ Skip steps: d=30 p=end sa=32 sp=39 dp=31 ] + [ Skip steps: r=30 d=end p=end sa=32 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 scrub (no-df max-mss 224) - [ Skip steps: p=end sa=32 sp=39 dp=31 ] + [ Skip steps: d=end p=end sa=32 sp=39 dp=31 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @30 match proto tcp all scrub (random-id) - [ Skip steps: i=38 d=32 f=34 p=end sa=32 sp=39 da=34 ] + [ Skip steps: i=38 r=32 d=end f=34 p=end sa=32 da=34 sp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @31 match proto tcp from any to any port = www - [ Skip steps: i=38 f=34 p=end sp=39 da=34 dp=39 ] + [ Skip steps: i=38 d=end f=34 p=end da=34 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @32 match in proto tcp from <regress.1:*> to any port = www - [ Skip steps: i=38 d=58 f=34 p=end sp=39 da=34 dp=39 ] + [ Skip steps: i=38 r=58 d=end f=34 p=end da=34 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @33 match in proto tcp from ! <regress.2:*> to any port = www - [ Skip steps: i=38 d=58 p=end sp=39 dp=39 ] + [ Skip steps: i=38 r=58 d=end p=end sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @34 match in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = www - [ Skip steps: i=38 d=58 f=38 p=end sa=36 sp=39 dp=39 ] + [ Skip steps: i=38 r=58 d=end f=38 p=end sa=36 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @35 match in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = www - [ Skip steps: i=38 d=58 f=38 p=end sp=39 dp=39 ] + [ Skip steps: i=38 r=58 d=end f=38 p=end sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @36 match in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = www - [ Skip steps: i=38 d=58 f=38 p=end sa=38 sp=39 dp=39 ] + [ Skip steps: i=38 r=58 d=end f=38 p=end sa=38 sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @37 match in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = www - [ Skip steps: d=58 p=end sp=39 dp=39 ] + [ Skip steps: r=58 d=end p=end sp=39 dp=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @38 match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25) - [ Skip steps: i=42 d=58 p=end ] + [ Skip steps: i=42 r=58 d=end p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @39 match in log on lo0 inet6 proto tcp from (lo1000000:*) port = www to 2000::1 - [ Skip steps: i=42 d=58 f=41 p=end sp=44 da=41 dp=45 ] + [ Skip steps: i=42 r=58 d=end f=41 p=end da=41 sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @40 match in log on lo0 inet6 proto tcp from (lo0:2) port = www to 2000::1 - [ Skip steps: i=42 d=58 p=end sp=44 dp=45 ] + [ Skip steps: i=42 r=58 d=end p=end sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @41 match in log on lo0 proto tcp from any port = www to any - [ Skip steps: d=58 f=57 p=end sa=57 sp=44 da=59 dp=45 ] + [ Skip steps: r=58 d=end f=57 p=end sa=57 da=59 sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @42 match in log on lo1000000 proto tcp from any port = www to any - [ Skip steps: d=58 f=57 p=end sa=57 sp=44 da=59 dp=45 ] + [ Skip steps: r=58 d=end f=57 p=end sa=57 da=59 sp=44 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @43 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 dp=45 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 dp=45 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @44 match in on lo0 proto tcp from any port = 81 to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @45 match in on lo0 proto tcp from any to any port = www scrub (max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @46 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 sp=48 da=59 dp=48 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=48 dp=48 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @47 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @48 match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 sp=51 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=51 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @49 match in on lo0 proto tcp from any to any port = 81 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 sp=51 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=51 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @50 match in on lo0 proto tcp from any to any port = 82 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @51 match in on lo0 proto tcp from any port = www to any port = www scrub (no-df) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 sp=54 da=59 dp=53 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=54 dp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @52 match in on lo0 proto tcp from any port = www to any port = www scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 sp=54 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=54 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @53 match in on lo0 proto tcp from any port = www to any port = 81 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @54 match in on lo0 proto tcp from any port = 81 to any port = www scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 sp=56 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=56 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @55 match in on lo0 proto tcp from any port = 81 to any port = 81 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 f=57 p=end sa=57 da=59 ] + [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @56 match in on lo0 proto tcp from any to any port = 83 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=59 d=58 p=end da=59 ] + [ Skip steps: i=59 r=58 d=end p=end da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @57 match in on lo0 inet proto tcp from (lo0:1) port = www to any - [ Skip steps: i=59 p=end da=59 ] + [ Skip steps: i=59 d=end p=end da=59 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @58 match on lo0 proto tcp from any to any port = www scrub (max-mss 224) - [ Skip steps: f=61 p=end sa=end sp=end dp=end ] + [ Skip steps: d=end f=61 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @59 match out proto tcp from any to ! <regress.1:*> port = www - [ Skip steps: i=61 d=end f=61 p=end sa=end sp=end dp=end ] + [ Skip steps: i=61 r=end d=end f=61 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @60 match out proto tcp from any to <regress.2:*> port = www - [ Skip steps: d=end p=end sa=end sp=end dp=end ] + [ Skip steps: r=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @61 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf68.optimized b/regress/sbin/pfctl/pf68.optimized index b643819042c..d9766c66e3a 100644 --- a/regress/sbin/pfctl/pf68.optimized +++ b/regress/sbin/pfctl/pf68.optimized @@ -1,148 +1,148 @@ @0 match proto tcp all - [ Skip steps: i=8 f=2 p=end sa=2 sp=22 da=2 dp=19 ] + [ Skip steps: i=8 d=end f=2 p=end sa=2 da=2 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in proto tcp all scrub (reassemble tcp) - [ Skip steps: i=8 d=14 p=end sp=22 dp=19 ] + [ Skip steps: i=8 r=14 d=end p=end sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in inet proto tcp from 10.0.0.1 to 10.0.0.3 - [ Skip steps: i=8 d=14 f=6 p=end sa=4 sp=22 dp=19 ] + [ Skip steps: i=8 r=14 d=end f=6 p=end sa=4 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 match in inet proto tcp from 10.0.0.1 to 10.0.0.4 - [ Skip steps: i=8 d=14 f=6 p=end sp=22 dp=19 ] + [ Skip steps: i=8 r=14 d=end f=6 p=end sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 match in inet proto tcp from 10.0.0.2 to 10.0.0.3 - [ Skip steps: i=8 d=14 f=6 p=end sa=6 sp=22 dp=19 ] + [ Skip steps: i=8 r=14 d=end f=6 p=end sa=6 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 match in inet proto tcp from 10.0.0.2 to 10.0.0.4 - [ Skip steps: i=8 d=14 p=end sp=22 dp=19 ] + [ Skip steps: i=8 r=14 d=end p=end sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 match in proto tcp from <regress.1:*> to any - [ Skip steps: i=8 d=14 f=17 p=end sp=22 da=15 dp=19 ] + [ Skip steps: i=8 r=14 d=end f=17 p=end da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 match in proto tcp from ! <regress.2:*> to any - [ Skip steps: d=14 f=17 p=end sp=22 da=15 dp=19 ] + [ Skip steps: r=14 d=end f=17 p=end da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 match in log on lo0 proto tcp all scrub (min-ttl 25) - [ Skip steps: d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ] + [ Skip steps: r=14 d=end f=17 p=end sa=20 da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 match in log on lo1000000 proto tcp all - [ Skip steps: d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ] + [ Skip steps: r=14 d=end f=17 p=end sa=20 da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 match in on lo0 proto tcp all - [ Skip steps: i=14 d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ] + [ Skip steps: i=14 r=14 d=end f=17 p=end sa=20 da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=14 d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ] + [ Skip steps: i=14 r=14 d=end f=17 p=end sa=20 da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match in on lo0 proto tcp all scrub (max-mss 224) - [ Skip steps: i=14 d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ] + [ Skip steps: i=14 r=14 d=end f=17 p=end sa=20 da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: f=17 p=end sa=20 sp=22 da=15 dp=19 ] + [ Skip steps: d=end f=17 p=end sa=20 da=15 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out proto tcp all - [ Skip steps: i=16 d=16 f=17 p=end sa=20 sp=22 dp=19 ] + [ Skip steps: i=16 r=16 d=end f=17 p=end sa=20 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 match out proto tcp from any to ! <regress.1:*> - [ Skip steps: f=17 p=end sa=20 sp=22 dp=19 ] + [ Skip steps: d=end f=17 p=end sa=20 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 match on lo0 proto tcp all scrub (max-mss 224) - [ Skip steps: p=end sa=20 sp=22 dp=19 ] + [ Skip steps: d=end p=end sa=20 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 scrub (no-df max-mss 224) - [ Skip steps: p=end sa=20 sp=22 dp=19 ] + [ Skip steps: d=end p=end sa=20 sp=22 dp=19 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 match proto tcp all scrub (random-id) - [ Skip steps: i=21 d=20 f=35 p=end sa=20 sp=22 da=32 ] + [ Skip steps: i=21 r=20 d=end f=35 p=end sa=20 da=32 sp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 match proto tcp from any to any port = www - [ Skip steps: i=21 f=35 p=end sp=22 da=32 dp=22 ] + [ Skip steps: i=21 d=end f=35 p=end da=32 sp=22 dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 match in proto tcp from ! <regress.2:*> to any port = www - [ Skip steps: d=32 f=35 p=end sp=22 da=32 dp=22 ] + [ Skip steps: r=32 d=end f=35 p=end da=32 sp=22 dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25) - [ Skip steps: i=23 d=32 f=35 p=end sa=35 da=32 ] + [ Skip steps: i=23 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 match in log on lo0 proto tcp from any port = www to any - [ Skip steps: d=32 f=35 p=end sa=35 sp=25 da=32 dp=26 ] + [ Skip steps: r=32 d=end f=35 p=end sa=35 da=32 sp=25 dp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 match in log on lo1000000 proto tcp from any port = www to any - [ Skip steps: d=32 f=35 p=end sa=35 sp=25 da=32 dp=26 ] + [ Skip steps: r=32 d=end f=35 p=end sa=35 da=32 sp=25 dp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 dp=26 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 dp=26 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 match in on lo0 proto tcp from any port = 81 to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 match in on lo0 proto tcp from any to any port = www scrub (max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 sp=35 da=32 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 match in on lo0 proto tcp from any to any port = 81 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 sp=35 da=32 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @30 match in on lo0 proto tcp from any to any port = 82 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: i=32 d=32 f=35 p=end sa=35 sp=35 da=32 ] + [ Skip steps: i=32 r=32 d=end f=35 p=end sa=35 da=32 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @31 match in on lo0 proto tcp from any to any port = 83 scrub (no-df min-ttl 15 max-mss 224) - [ Skip steps: f=35 p=end sa=35 sp=35 ] + [ Skip steps: d=end f=35 p=end sa=35 sp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @32 match out proto tcp from any to ! <regress.1:*> port = www - [ Skip steps: i=34 d=34 f=35 p=end sa=35 sp=35 dp=35 ] + [ Skip steps: i=34 r=34 d=end f=35 p=end sa=35 sp=35 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @33 match out proto tcp from any to <regress.2:*> port = www - [ Skip steps: f=35 p=end sa=35 sp=35 dp=35 ] + [ Skip steps: d=end f=35 p=end sa=35 sp=35 dp=35 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @34 match on lo0 proto tcp from any to any port = www scrub (max-mss 224) - [ Skip steps: i=36 p=end da=36 ] + [ Skip steps: i=36 d=end p=end da=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @35 match in on lo0 inet proto tcp from (lo0:1) port = www to any - [ Skip steps: f=end p=end ] + [ Skip steps: d=end f=end p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @36 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf69.loaded b/regress/sbin/pfctl/pf69.loaded index 5917920d1e8..524e70194f3 100644 --- a/regress/sbin/pfctl/pf69.loaded +++ b/regress/sbin/pfctl/pf69.loaded @@ -1,8 +1,8 @@ @0 match out on lo0 inet all tag regress nat-to 127.0.0.1 - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out quick on lo0 all flags S/SA keep state tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass out quick on lo0 all flags S/SA tagged regress + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf69.ok b/regress/sbin/pfctl/pf69.ok index 2bf34c04baa..dedfef92db3 100644 --- a/regress/sbin/pfctl/pf69.ok +++ b/regress/sbin/pfctl/pf69.ok @@ -1,2 +1,2 @@ match out on lo0 inet all tag regress nat-to 127.0.0.1 -pass out quick on lo0 all flags S/SA keep state tagged regress +pass out quick on lo0 all flags S/SA tagged regress diff --git a/regress/sbin/pfctl/pf69.optimized b/regress/sbin/pfctl/pf69.optimized index 5917920d1e8..524e70194f3 100644 --- a/regress/sbin/pfctl/pf69.optimized +++ b/regress/sbin/pfctl/pf69.optimized @@ -1,8 +1,8 @@ @0 match out on lo0 inet all tag regress nat-to 127.0.0.1 - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out quick on lo0 all flags S/SA keep state tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass out quick on lo0 all flags S/SA tagged regress + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf7.loaded b/regress/sbin/pfctl/pf7.loaded index 58e2422f418..b114ca78ae0 100644 --- a/regress/sbin/pfctl/pf7.loaded +++ b/regress/sbin/pfctl/pf7.loaded @@ -1,108 +1,108 @@ @0 block drop out log on tun1000000 all - [ Skip steps: i=end f=6 p=2 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 p=2 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log on tun1000000 all - [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst out log on tun1000000 proto tcp all - [ Skip steps: i=end f=6 p=4 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 p=4 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block return-rst in log on tun1000000 proto tcp all - [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all - [ Skip steps: i=end f=6 p=6 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 p=6 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all - [ Skip steps: i=end sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any - [ Skip steps: i=end f=14 p=12 sp=end dp=15 ] + [ Skip steps: i=end d=end f=14 p=12 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in quick on tun1000000 inet from any to 255.255.255.255 - [ Skip steps: i=end d=12 f=14 p=12 sp=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=14 p=12 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any - [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=14 p=12 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any - [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=14 p=12 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any - [ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=14 p=12 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any - [ Skip steps: i=end f=14 sp=end da=end dp=15 ] + [ Skip steps: i=end d=end f=14 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end f=14 p=14 sa=end sp=end da=end dp=15 ] +@12 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end d=end f=14 p=14 sa=end da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end sa=end sp=end da=end dp=15 ] +@13 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end d=end sa=end da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass out on tun1000000 proto udp all keep state - [ Skip steps: i=end f=end p=16 sa=end sp=end da=end ] +@14 pass out on tun1000000 proto udp all + [ Skip steps: i=end d=end f=end p=16 sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun1000000 proto udp from any to any port = domain keep state - [ Skip steps: i=end f=end sa=end sp=end da=end ] +@15 pass in on tun1000000 proto udp from any to any port = domain + [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 pass out on tun1000000 proto tcp all flags S/SA modulate state - [ Skip steps: i=end f=end p=18 sa=end sp=end da=end dp=23 ] + [ Skip steps: i=end d=end f=end p=18 sa=end da=end sp=end dp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 pass in on tun1000000 proto tcp all flags S/SA modulate state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=23 ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun1000000 proto udp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=23 ] +@18 pass in on tun1000000 proto udp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on tun1000000 proto icmp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=23 ] +@19 pass in on tun1000000 proto icmp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on tun1000000 proto udp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=23 ] +@20 pass in on tun1000000 proto udp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 pass in on tun1000000 proto tcp all flags S/SA synproxy state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=23 ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 pass in on tun1000000 proto icmp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end ] +@22 pass in on tun1000000 proto icmp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf7.ok b/regress/sbin/pfctl/pf7.ok index 357f3180e30..08b9fc2bacb 100644 --- a/regress/sbin/pfctl/pf7.ok +++ b/regress/sbin/pfctl/pf7.ok @@ -10,17 +10,17 @@ block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any block drop in log quick on tun1000000 inet from 255.255.255.255 to any -pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state -pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state -pass out on tun1000000 proto udp all keep state -pass in on tun1000000 proto udp from any to any port = domain keep state +pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 +pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 +pass out on tun1000000 proto udp all +pass in on tun1000000 proto udp from any to any port = domain pass out on tun1000000 proto tcp all flags S/SA modulate state pass in on tun1000000 proto tcp all flags S/SA modulate state -pass in on tun1000000 proto udp all keep state -pass in on tun1000000 proto icmp all keep state -pass in on tun1000000 proto udp all keep state +pass in on tun1000000 proto udp all +pass in on tun1000000 proto icmp all +pass in on tun1000000 proto udp all pass in on tun1000000 proto tcp all flags S/SA synproxy state -pass in on tun1000000 proto icmp all keep state +pass in on tun1000000 proto icmp all pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA modulate state pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA modulate state pass in on tun1000000 proto tcp from any to any port = domain flags S/SA modulate state diff --git a/regress/sbin/pfctl/pf7.optimized b/regress/sbin/pfctl/pf7.optimized index 79170824334..d0bbee1432f 100644 --- a/regress/sbin/pfctl/pf7.optimized +++ b/regress/sbin/pfctl/pf7.optimized @@ -1,104 +1,104 @@ @0 block drop out log on tun1000000 all - [ Skip steps: i=end f=6 p=2 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 p=2 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log on tun1000000 all - [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst out log on tun1000000 proto tcp all - [ Skip steps: i=end f=6 p=4 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 p=4 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block return-rst in log on tun1000000 proto tcp all - [ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all - [ Skip steps: i=end f=6 p=6 sa=6 sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end f=6 p=6 sa=6 da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all - [ Skip steps: i=end sp=end da=7 dp=15 ] + [ Skip steps: i=end d=end da=7 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any - [ Skip steps: i=end f=13 p=12 sp=end dp=15 ] + [ Skip steps: i=end d=end f=13 p=12 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in quick on tun1000000 inet from any to 255.255.255.255 - [ Skip steps: i=end d=12 f=13 p=12 sp=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=13 p=12 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any - [ Skip steps: i=end d=12 f=13 p=12 sp=end da=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=13 p=12 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any - [ Skip steps: i=end d=12 f=13 p=12 sp=end da=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=13 p=12 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any - [ Skip steps: i=end d=12 f=13 p=12 sp=end da=end dp=15 ] + [ Skip steps: i=end r=12 d=end f=13 p=12 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any - [ Skip steps: i=end f=13 sp=end da=end dp=15 ] + [ Skip steps: i=end d=end f=13 da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end d=14 sa=end sp=end da=end dp=15 ] +@12 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end r=14 d=end sa=end da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out on tun1000000 proto udp all keep state - [ Skip steps: i=end sa=end sp=end da=end dp=15 ] +@13 pass out on tun1000000 proto udp all + [ Skip steps: i=end d=end sa=end da=end sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 keep state - [ Skip steps: i=end d=16 sa=end sp=end da=end ] +@14 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0 + [ Skip steps: i=end r=16 d=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on tun1000000 proto udp from any to any port = domain keep state - [ Skip steps: i=end f=end sa=end sp=end da=end ] +@15 pass in on tun1000000 proto udp from any to any port = domain + [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 pass out on tun1000000 proto tcp all flags S/SA modulate state - [ Skip steps: i=end f=end p=18 sa=end sp=end da=end dp=22 ] + [ Skip steps: i=end d=end f=end p=18 sa=end da=end sp=end dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 pass in on tun1000000 proto tcp all flags S/SA modulate state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=22 ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on tun1000000 proto udp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=22 ] +@18 pass in on tun1000000 proto udp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on tun1000000 proto icmp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=22 ] +@19 pass in on tun1000000 proto icmp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 pass in on tun1000000 proto tcp all flags S/SA synproxy state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=22 ] + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=22 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on tun1000000 proto icmp all keep state - [ Skip steps: i=end d=end f=end sa=end sp=end da=end ] +@21 pass in on tun1000000 proto icmp all + [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 pass in on tun1000000 proto tcp from any to any port = ssh flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 pass in on tun1000000 proto tcp from any to any port = smtp flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 pass in on tun1000000 proto tcp from any to any port = domain flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 pass in on tun1000000 proto tcp from any to any port = auth flags S/SA modulate state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf70.loaded b/regress/sbin/pfctl/pf70.loaded index d7def5f0759..6f6450404aa 100644 --- a/regress/sbin/pfctl/pf70.loaded +++ b/regress/sbin/pfctl/pf70.loaded @@ -1,8 +1,8 @@ @0 match out on lo0 inet from 10.0.0.0/8 to any nat-to 127.0.0.1 - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end da=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 all tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf70.optimized b/regress/sbin/pfctl/pf70.optimized index d7def5f0759..6f6450404aa 100644 --- a/regress/sbin/pfctl/pf70.optimized +++ b/regress/sbin/pfctl/pf70.optimized @@ -1,8 +1,8 @@ @0 match out on lo0 inet from 10.0.0.0/8 to any nat-to 127.0.0.1 - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end da=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 all tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf71.loaded b/regress/sbin/pfctl/pf71.loaded index ff6a9788a91..da644e740ad 100644 --- a/regress/sbin/pfctl/pf71.loaded +++ b/regress/sbin/pfctl/pf71.loaded @@ -1,8 +1,8 @@ @0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = www rdr-to 127.0.0.1 - [ Skip steps: i=end sp=end da=end ] + [ Skip steps: i=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop out on lo0 all tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf71.optimized b/regress/sbin/pfctl/pf71.optimized index ff6a9788a91..da644e740ad 100644 --- a/regress/sbin/pfctl/pf71.optimized +++ b/regress/sbin/pfctl/pf71.optimized @@ -1,8 +1,8 @@ @0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = www rdr-to 127.0.0.1 - [ Skip steps: i=end sp=end da=end ] + [ Skip steps: i=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop out on lo0 all tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf72.loaded b/regress/sbin/pfctl/pf72.loaded index f8fac6f30f2..49b60c01daf 100644 --- a/regress/sbin/pfctl/pf72.loaded +++ b/regress/sbin/pfctl/pf72.loaded @@ -1,12 +1,12 @@ @0 match out on lo0 inet from 192.168.1.1 to any tag regress nat-to 10.0.0.1 static-port - [ Skip steps: i=end f=2 p=end sp=end dp=end ] + [ Skip steps: i=end d=end f=2 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet from any to 10.0.0.1 tag regress rdr-to 192.168.1.1 - [ Skip steps: i=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop out on lo0 all tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf72.optimized b/regress/sbin/pfctl/pf72.optimized index f8fac6f30f2..49b60c01daf 100644 --- a/regress/sbin/pfctl/pf72.optimized +++ b/regress/sbin/pfctl/pf72.optimized @@ -1,12 +1,12 @@ @0 match out on lo0 inet from 192.168.1.1 to any tag regress nat-to 10.0.0.1 static-port - [ Skip steps: i=end f=2 p=end sp=end dp=end ] + [ Skip steps: i=end d=end f=2 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on lo0 inet from any to 10.0.0.1 tag regress rdr-to 192.168.1.1 - [ Skip steps: i=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop out on lo0 all tagged regress - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf73.loaded b/regress/sbin/pfctl/pf73.loaded index ffc4d0bf289..cb5a95d4dd8 100644 --- a/regress/sbin/pfctl/pf73.loaded +++ b/regress/sbin/pfctl/pf73.loaded @@ -1,4 +1,4 @@ -@0 pass proto tcp all flags S/SA keep state scrub (reassemble tcp) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass proto tcp all flags S/SA scrub (reassemble tcp) + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf73.ok b/regress/sbin/pfctl/pf73.ok index 8d299ff3b1f..05d0f19018c 100644 --- a/regress/sbin/pfctl/pf73.ok +++ b/regress/sbin/pfctl/pf73.ok @@ -1 +1 @@ -pass proto tcp all flags S/SA keep state scrub (reassemble tcp) +pass proto tcp all flags S/SA scrub (reassemble tcp) diff --git a/regress/sbin/pfctl/pf73.optimized b/regress/sbin/pfctl/pf73.optimized index ffc4d0bf289..cb5a95d4dd8 100644 --- a/regress/sbin/pfctl/pf73.optimized +++ b/regress/sbin/pfctl/pf73.optimized @@ -1,4 +1,4 @@ -@0 pass proto tcp all flags S/SA keep state scrub (reassemble tcp) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass proto tcp all flags S/SA scrub (reassemble tcp) + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf74.loaded b/regress/sbin/pfctl/pf74.loaded index 9620cb7becb..1a161d105be 100644 --- a/regress/sbin/pfctl/pf74.loaded +++ b/regress/sbin/pfctl/pf74.loaded @@ -1,4 +1,4 @@ @0 pass in proto tcp all flags S/SA synproxy state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf74.optimized b/regress/sbin/pfctl/pf74.optimized index 9620cb7becb..1a161d105be 100644 --- a/regress/sbin/pfctl/pf74.optimized +++ b/regress/sbin/pfctl/pf74.optimized @@ -1,4 +1,4 @@ @0 pass in proto tcp all flags S/SA synproxy state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf75.loaded b/regress/sbin/pfctl/pf75.loaded index 22bd950ef29..8bd1156119b 100644 --- a/regress/sbin/pfctl/pf75.loaded +++ b/regress/sbin/pfctl/pf75.loaded @@ -1,8 +1,8 @@ @0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = ssh tag ssh - [ Skip steps: i=end d=end sp=end da=end ] + [ Skip steps: i=end r=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in quick on lo0 all ! tagged ssh - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf75.optimized b/regress/sbin/pfctl/pf75.optimized index 22bd950ef29..8bd1156119b 100644 --- a/regress/sbin/pfctl/pf75.optimized +++ b/regress/sbin/pfctl/pf75.optimized @@ -1,8 +1,8 @@ @0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = ssh tag ssh - [ Skip steps: i=end d=end sp=end da=end ] + [ Skip steps: i=end r=end d=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in quick on lo0 all ! tagged ssh - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf76.loaded b/regress/sbin/pfctl/pf76.loaded index 344809da591..049f1e16724 100644 --- a/regress/sbin/pfctl/pf76.loaded +++ b/regress/sbin/pfctl/pf76.loaded @@ -1,8 +1,8 @@ @0 match out on lo0 inet from 1.2.3.4 to 5.6.7.8 nat-to 127.0.0.1 static-port - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @1 match in on lo0 inet from 5.6.7.8 to 127.0.0.1 rdr-to 1.2.3.4 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf76.optimized b/regress/sbin/pfctl/pf76.optimized index 344809da591..049f1e16724 100644 --- a/regress/sbin/pfctl/pf76.optimized +++ b/regress/sbin/pfctl/pf76.optimized @@ -1,8 +1,8 @@ @0 match out on lo0 inet from 1.2.3.4 to 5.6.7.8 nat-to 127.0.0.1 static-port - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @1 match in on lo0 inet from 5.6.7.8 to 127.0.0.1 rdr-to 1.2.3.4 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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 4a385db4e57..b8a01ce8140 100644 --- a/regress/sbin/pfctl/pf77.loaded +++ b/regress/sbin/pfctl/pf77.loaded @@ -1,4 +1,4 @@ -@0 pass inet from (lo0:1)/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass inet from (lo0:1)/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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.ok b/regress/sbin/pfctl/pf77.ok index 233d434b782..53aaf44cf17 100644 --- a/regress/sbin/pfctl/pf77.ok +++ b/regress/sbin/pfctl/pf77.ok @@ -1 +1 @@ -pass inet from (lo0)/8 to any flags S/SA keep state +pass inet from (lo0)/8 to any flags S/SA diff --git a/regress/sbin/pfctl/pf77.optimized b/regress/sbin/pfctl/pf77.optimized index 4a385db4e57..b8a01ce8140 100644 --- a/regress/sbin/pfctl/pf77.optimized +++ b/regress/sbin/pfctl/pf77.optimized @@ -1,4 +1,4 @@ -@0 pass inet from (lo0:1)/8 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass inet from (lo0:1)/8 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf78.loaded b/regress/sbin/pfctl/pf78.loaded index 6331280546d..fcd5d508c41 100644 --- a/regress/sbin/pfctl/pf78.loaded +++ b/regress/sbin/pfctl/pf78.loaded @@ -1,4 +1,4 @@ -@0 pass in inet from 10.0.0.1 to <regress:*> flags S/SA keep state label "10.0.0.1:<regress>" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in inet from 10.0.0.1 to <regress:*> flags S/SA label "10.0.0.1:<regress>" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf78.ok b/regress/sbin/pfctl/pf78.ok index fed726e4f67..6624dc8204a 100644 --- a/regress/sbin/pfctl/pf78.ok +++ b/regress/sbin/pfctl/pf78.ok @@ -1 +1 @@ -pass in inet from 10.0.0.1 to <regress> flags S/SA keep state label "10.0.0.1:<regress>" +pass in inet from 10.0.0.1 to <regress> flags S/SA label "10.0.0.1:<regress>" diff --git a/regress/sbin/pfctl/pf78.optimized b/regress/sbin/pfctl/pf78.optimized index 6331280546d..fcd5d508c41 100644 --- a/regress/sbin/pfctl/pf78.optimized +++ b/regress/sbin/pfctl/pf78.optimized @@ -1,4 +1,4 @@ -@0 pass in inet from 10.0.0.1 to <regress:*> flags S/SA keep state label "10.0.0.1:<regress>" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in inet from 10.0.0.1 to <regress:*> flags S/SA label "10.0.0.1:<regress>" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf79.loaded b/regress/sbin/pfctl/pf79.loaded index 85c2ff71473..8ae93f59ee1 100644 --- a/regress/sbin/pfctl/pf79.loaded +++ b/regress/sbin/pfctl/pf79.loaded @@ -1,4 +1,4 @@ -@0 pass in inet from 10.0.0.1 to no-route flags S/SA keep state label "10.0.0.1:no-route" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in inet from 10.0.0.1 to no-route flags S/SA label "10.0.0.1:no-route" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf79.ok b/regress/sbin/pfctl/pf79.ok index a21475d63ec..4fbeab12aa7 100644 --- a/regress/sbin/pfctl/pf79.ok +++ b/regress/sbin/pfctl/pf79.ok @@ -1 +1 @@ -pass in inet from 10.0.0.1 to no-route flags S/SA keep state label "10.0.0.1:no-route" +pass in inet from 10.0.0.1 to no-route flags S/SA label "10.0.0.1:no-route" diff --git a/regress/sbin/pfctl/pf79.optimized b/regress/sbin/pfctl/pf79.optimized index 85c2ff71473..8ae93f59ee1 100644 --- a/regress/sbin/pfctl/pf79.optimized +++ b/regress/sbin/pfctl/pf79.optimized @@ -1,4 +1,4 @@ -@0 pass in inet from 10.0.0.1 to no-route flags S/SA keep state label "10.0.0.1:no-route" - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass in inet from 10.0.0.1 to no-route flags S/SA label "10.0.0.1:no-route" + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf8.loaded b/regress/sbin/pfctl/pf8.loaded index ecadb4f064c..b9148158e10 100644 --- a/regress/sbin/pfctl/pf8.loaded +++ b/regress/sbin/pfctl/pf8.loaded @@ -1,8 +1,8 @@ @0 block drop out log on tun1000001 inet from ! 10.0.0.0/8 to any - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop out log on tun1000001 inet from 10.1.2.3 to any - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf8.optimized b/regress/sbin/pfctl/pf8.optimized index ecadb4f064c..b9148158e10 100644 --- a/regress/sbin/pfctl/pf8.optimized +++ b/regress/sbin/pfctl/pf8.optimized @@ -1,8 +1,8 @@ @0 block drop out log on tun1000001 inet from ! 10.0.0.0/8 to any - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop out log on tun1000001 inet from 10.1.2.3 to any - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf80.loaded b/regress/sbin/pfctl/pf80.loaded index 3c3e7f6cfa1..e6faf3d07ad 100644 --- a/regress/sbin/pfctl/pf80.loaded +++ b/regress/sbin/pfctl/pf80.loaded @@ -1,64 +1,64 @@ -@0 pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] +@0 pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] +@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=5 sp=end dp=5 ] +@2 pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port + [ Skip steps: i=end d=end f=end p=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 - [ Skip steps: i=end f=end p=5 sp=end dp=5 ] +@3 pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 + [ Skip steps: i=end d=end f=end p=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] +@4 pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] +@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=9 sp=end dp=9 ] +@6 pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port + [ Skip steps: i=end d=end f=end p=9 sp=end dp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 - [ Skip steps: i=end f=end p=9 sp=end dp=9 ] +@7 pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 + [ Skip steps: i=end d=end f=end p=9 sp=end dp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] +@8 pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] +@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=13 sp=end dp=13 ] +@10 pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port + [ Skip steps: i=end d=end f=end p=13 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 - [ Skip steps: i=end f=end p=13 sp=end dp=13 ] +@11 pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 + [ Skip steps: i=end d=end f=end p=13 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = www rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @15 match in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 rdr-to 10.0.0.0/8 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf80.ok b/regress/sbin/pfctl/pf80.ok index 40f2d0541d7..aa951d816af 100644 --- a/regress/sbin/pfctl/pf80.ok +++ b/regress/sbin/pfctl/pf80.ok @@ -1,15 +1,15 @@ -pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 -pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 -pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port -pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 -pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 -pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 -pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port -pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 -pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 -pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 -pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port -pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 +pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 +pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port +pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 +pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 +pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port +pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 +pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 +pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 +pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port +pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 match out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 nat-to 172.16.0.1 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = www rdr-to 127.0.0.1 port 8080 match out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 nat-to 12.0.0.0/8 static-port diff --git a/regress/sbin/pfctl/pf80.optimized b/regress/sbin/pfctl/pf80.optimized index 3c3e7f6cfa1..e6faf3d07ad 100644 --- a/regress/sbin/pfctl/pf80.optimized +++ b/regress/sbin/pfctl/pf80.optimized @@ -1,64 +1,64 @@ -@0 pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] +@0 pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] +@1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=5 sp=end dp=5 ] +@2 pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port + [ Skip steps: i=end d=end f=end p=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 - [ Skip steps: i=end f=end p=5 sp=end dp=5 ] +@3 pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 + [ Skip steps: i=end d=end f=end p=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] +@4 pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] +@5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=9 sp=end dp=9 ] +@6 pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port + [ Skip steps: i=end d=end f=end p=9 sp=end dp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 - [ Skip steps: i=end f=end p=9 sp=end dp=9 ] +@7 pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 + [ Skip steps: i=end d=end f=end p=9 sp=end dp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA keep state nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] +@8 pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA keep state rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] +@9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www flags S/SA rdr-to 127.0.0.1 port 8080 + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA keep state nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=13 sp=end dp=13 ] +@10 pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port + [ Skip steps: i=end d=end f=end p=13 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA keep state rdr-to 10.0.0.0/8 - [ Skip steps: i=end f=end p=13 sp=end dp=13 ] +@11 pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8 + [ Skip steps: i=end d=end f=end p=13 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 match out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 nat-to 172.16.0.1 - [ Skip steps: i=end f=end sp=end ] + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = www rdr-to 127.0.0.1 port 8080 - [ Skip steps: i=end f=end sp=end ] + [ Skip steps: i=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 match out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 nat-to 12.0.0.0/8 static-port - [ Skip steps: i=end f=end p=end sp=end dp=end ] + [ 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 ] @15 match in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 rdr-to 10.0.0.0/8 - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf81.loaded b/regress/sbin/pfctl/pf81.loaded index 27bc8275765..e3c305ad5d8 100644 --- a/regress/sbin/pfctl/pf81.loaded +++ b/regress/sbin/pfctl/pf81.loaded @@ -1,120 +1,120 @@ -@0 pass inet6 from (lo0:2) to ::1 flags S/SA keep state - [ Skip steps: i=end d=end f=3 p=end sa=6 sp=end dp=end ] +@0 pass inet6 from (lo0:2) to ::1 flags S/SA + [ Skip steps: i=end r=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:2) to ::2 flags S/SA keep state - [ Skip steps: i=end d=end f=3 p=end sa=6 sp=end dp=end ] +@1 pass inet6 from (lo0:2) to ::2 flags S/SA + [ Skip steps: i=end r=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:2) to ::3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=6 sp=end dp=end ] +@2 pass inet6 from (lo0:2) to ::3 flags S/SA + [ Skip steps: i=end r=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:1) to 0.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end f=6 p=end sa=6 sp=end dp=end ] +@3 pass inet from (lo0:1) to 0.0.0.1 flags S/SA + [ Skip steps: i=end r=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:1) to 0.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=end f=6 p=end sa=6 sp=end dp=end ] +@4 pass inet from (lo0:1) to 0.0.0.2 flags S/SA + [ Skip steps: i=end r=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:1) to 0.0.0.3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@5 pass inet from (lo0:1) to 0.0.0.3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass from <foo:*> to <bar1:*> flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=18 sp=end dp=end ] +@6 pass from <foo:*> to <bar1:*> flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass from <foo:*> to <bar2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=18 sp=end dp=end ] +@7 pass from <foo:*> to <bar2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass from <foo:*> to <bar3:*> flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=18 sp=end dp=end ] +@8 pass from <foo:*> to <bar3:*> flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass inet6 from <foo:*> to ::1 flags S/SA keep state - [ Skip steps: i=end d=end f=12 p=end sa=18 sp=end dp=end ] +@9 pass inet6 from <foo:*> to ::1 flags S/SA + [ Skip steps: i=end r=end d=end f=12 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass inet6 from <foo:*> to ::2 flags S/SA keep state - [ Skip steps: i=end d=end f=12 p=end sa=18 sp=end dp=end ] +@10 pass inet6 from <foo:*> to ::2 flags S/SA + [ Skip steps: i=end r=end d=end f=12 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass inet6 from <foo:*> to ::3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=18 sp=end dp=end ] +@11 pass inet6 from <foo:*> to ::3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass inet from <foo:*> to 0.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end f=15 p=end sa=18 sp=end dp=end ] +@12 pass inet from <foo:*> to 0.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end f=15 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass inet from <foo:*> to 0.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=end f=15 p=end sa=18 sp=end dp=end ] +@13 pass inet from <foo:*> to 0.0.0.2 flags S/SA + [ Skip steps: i=end r=end d=end f=15 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass inet from <foo:*> to 0.0.0.3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=18 sp=end dp=end ] +@14 pass inet from <foo:*> to 0.0.0.3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass from <foo:*> to <bar1:*> flags S/SA keep state - [ Skip steps: i=end d=end f=21 p=end sa=18 sp=end dp=end ] +@15 pass from <foo:*> to <bar1:*> flags S/SA + [ Skip steps: i=end r=end d=end f=21 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass from <foo:*> to <bar2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=21 p=end sa=18 sp=end dp=end ] +@16 pass from <foo:*> to <bar2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=21 p=end sa=18 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass from <foo:*> to <bar3:*> flags S/SA keep state - [ Skip steps: i=end d=end f=21 p=end sp=end dp=end ] +@17 pass from <foo:*> to <bar3:*> flags S/SA + [ Skip steps: i=end r=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 ] -@18 pass from no-route to <bar1:*> flags S/SA keep state - [ Skip steps: i=end d=end f=21 p=end sa=end sp=end dp=end ] +@18 pass from no-route to <bar1:*> flags S/SA + [ Skip steps: i=end r=end d=end f=21 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass from no-route to <bar2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=21 p=end sa=end sp=end dp=end ] +@19 pass from no-route to <bar2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=21 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass from no-route to <bar3:*> flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] +@20 pass from no-route to <bar3:*> flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass inet6 from no-route to ::1 flags S/SA keep state - [ Skip steps: i=end d=end f=24 p=end sa=end sp=end dp=end ] +@21 pass inet6 from no-route to ::1 flags S/SA + [ Skip steps: i=end r=end d=end f=24 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 pass inet6 from no-route to ::2 flags S/SA keep state - [ Skip steps: i=end d=end f=24 p=end sa=end sp=end dp=end ] +@22 pass inet6 from no-route to ::2 flags S/SA + [ Skip steps: i=end r=end d=end f=24 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 pass inet6 from no-route to ::3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] +@23 pass inet6 from no-route to ::3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 pass inet from no-route to 0.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end f=27 p=end sa=end sp=end dp=end ] +@24 pass inet from no-route to 0.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end f=27 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@25 pass inet from no-route to 0.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=end f=27 p=end sa=end sp=end dp=end ] +@25 pass inet from no-route to 0.0.0.2 flags S/SA + [ Skip steps: i=end r=end d=end f=27 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@26 pass inet from no-route to 0.0.0.3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] +@26 pass inet from no-route to 0.0.0.3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@27 pass from no-route to <bar1:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@27 pass from no-route to <bar1:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 pass from no-route to <bar2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@28 pass from no-route to <bar2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@29 pass from no-route to <bar3:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@29 pass from no-route to <bar3:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf81.ok b/regress/sbin/pfctl/pf81.ok index 2b58a18744d..67456bee281 100644 --- a/regress/sbin/pfctl/pf81.ok +++ b/regress/sbin/pfctl/pf81.ok @@ -1,32 +1,32 @@ ip_list = "{ ::1 ::2 ::3 0.0.0.1 0.0.0.2 0.0.0.3 }" table_list = "{ <bar1> <bar2> <bar3> }" -pass inet6 from (lo0) to ::1 flags S/SA keep state -pass inet6 from (lo0) to ::2 flags S/SA keep state -pass inet6 from (lo0) to ::3 flags S/SA keep state -pass inet from (lo0) to 0.0.0.1 flags S/SA keep state -pass inet from (lo0) to 0.0.0.2 flags S/SA keep state -pass inet from (lo0) to 0.0.0.3 flags S/SA keep state -pass from <foo> to <bar1> flags S/SA keep state -pass from <foo> to <bar2> flags S/SA keep state -pass from <foo> to <bar3> flags S/SA keep state -pass inet6 from <foo> to ::1 flags S/SA keep state -pass inet6 from <foo> to ::2 flags S/SA keep state -pass inet6 from <foo> to ::3 flags S/SA keep state -pass inet from <foo> to 0.0.0.1 flags S/SA keep state -pass inet from <foo> to 0.0.0.2 flags S/SA keep state -pass inet from <foo> to 0.0.0.3 flags S/SA keep state -pass from <foo> to <bar1> flags S/SA keep state -pass from <foo> to <bar2> flags S/SA keep state -pass from <foo> to <bar3> flags S/SA keep state -pass from no-route to <bar1> flags S/SA keep state -pass from no-route to <bar2> flags S/SA keep state -pass from no-route to <bar3> flags S/SA keep state -pass inet6 from no-route to ::1 flags S/SA keep state -pass inet6 from no-route to ::2 flags S/SA keep state -pass inet6 from no-route to ::3 flags S/SA keep state -pass inet from no-route to 0.0.0.1 flags S/SA keep state -pass inet from no-route to 0.0.0.2 flags S/SA keep state -pass inet from no-route to 0.0.0.3 flags S/SA keep state -pass from no-route to <bar1> flags S/SA keep state -pass from no-route to <bar2> flags S/SA keep state -pass from no-route to <bar3> flags S/SA keep state +pass inet6 from (lo0) to ::1 flags S/SA +pass inet6 from (lo0) to ::2 flags S/SA +pass inet6 from (lo0) to ::3 flags S/SA +pass inet from (lo0) to 0.0.0.1 flags S/SA +pass inet from (lo0) to 0.0.0.2 flags S/SA +pass inet from (lo0) to 0.0.0.3 flags S/SA +pass from <foo> to <bar1> flags S/SA +pass from <foo> to <bar2> flags S/SA +pass from <foo> to <bar3> flags S/SA +pass inet6 from <foo> to ::1 flags S/SA +pass inet6 from <foo> to ::2 flags S/SA +pass inet6 from <foo> to ::3 flags S/SA +pass inet from <foo> to 0.0.0.1 flags S/SA +pass inet from <foo> to 0.0.0.2 flags S/SA +pass inet from <foo> to 0.0.0.3 flags S/SA +pass from <foo> to <bar1> flags S/SA +pass from <foo> to <bar2> flags S/SA +pass from <foo> to <bar3> flags S/SA +pass from no-route to <bar1> flags S/SA +pass from no-route to <bar2> flags S/SA +pass from no-route to <bar3> flags S/SA +pass inet6 from no-route to ::1 flags S/SA +pass inet6 from no-route to ::2 flags S/SA +pass inet6 from no-route to ::3 flags S/SA +pass inet from no-route to 0.0.0.1 flags S/SA +pass inet from no-route to 0.0.0.2 flags S/SA +pass inet from no-route to 0.0.0.3 flags S/SA +pass from no-route to <bar1> flags S/SA +pass from no-route to <bar2> flags S/SA +pass from no-route to <bar3> flags S/SA diff --git a/regress/sbin/pfctl/pf81.optimized b/regress/sbin/pfctl/pf81.optimized index 8fa336403f6..c6e07e85e87 100644 --- a/regress/sbin/pfctl/pf81.optimized +++ b/regress/sbin/pfctl/pf81.optimized @@ -1,96 +1,96 @@ -@0 pass inet6 from (lo0:2) to ::1 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=3 sp=end dp=end ] +@0 pass inet6 from (lo0:2) to ::1 flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet6 from (lo0:2) to ::2 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=3 sp=end dp=end ] +@1 pass inet6 from (lo0:2) to ::2 flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sa=3 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet6 from (lo0:2) to ::3 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sp=end dp=end ] +@2 pass inet6 from (lo0:2) to ::3 flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet6 from <foo:*> to ::1 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=6 sp=end dp=end ] +@3 pass inet6 from <foo:*> to ::1 flags S/SA + [ Skip steps: i=end r=end d=end f=9 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 inet6 from <foo:*> to ::2 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=6 sp=end dp=end ] +@4 pass inet6 from <foo:*> to ::2 flags S/SA + [ Skip steps: i=end r=end d=end f=9 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 inet6 from <foo:*> to ::3 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sp=end dp=end ] +@5 pass inet6 from <foo:*> to ::3 flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass inet6 from no-route to ::1 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=9 sp=end dp=end ] +@6 pass inet6 from no-route to ::1 flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sa=9 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass inet6 from no-route to ::2 flags S/SA keep state - [ Skip steps: i=end d=end f=9 p=end sa=9 sp=end dp=end ] +@7 pass inet6 from no-route to ::2 flags S/SA + [ Skip steps: i=end r=end d=end f=9 p=end sa=9 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass inet6 from no-route to ::3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end dp=end ] +@8 pass inet6 from no-route to ::3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass inet from (lo0:1) to 0.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sa=12 sp=end dp=end ] +@9 pass inet from (lo0:1) to 0.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sa=12 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass inet from (lo0:1) to 0.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sa=12 sp=end dp=end ] +@10 pass inet from (lo0:1) to 0.0.0.2 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sa=12 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass inet from (lo0:1) to 0.0.0.3 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sp=end dp=end ] +@11 pass inet from (lo0:1) to 0.0.0.3 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass inet from <foo:*> to 0.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sa=15 sp=end dp=end ] +@12 pass inet from <foo:*> to 0.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sa=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass inet from <foo:*> to 0.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sa=15 sp=end dp=end ] +@13 pass inet from <foo:*> to 0.0.0.2 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sa=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass inet from <foo:*> to 0.0.0.3 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sp=end dp=end ] +@14 pass inet from <foo:*> to 0.0.0.3 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass inet from no-route to 0.0.0.1 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sa=21 sp=end dp=end ] +@15 pass inet from no-route to 0.0.0.1 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sa=21 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass inet from no-route to 0.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=end f=18 p=end sa=21 sp=end dp=end ] +@16 pass inet from no-route to 0.0.0.2 flags S/SA + [ Skip steps: i=end r=end d=end f=18 p=end sa=21 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass inet from no-route to 0.0.0.3 flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=21 sp=end dp=end ] +@17 pass inet from no-route to 0.0.0.3 flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=21 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass from no-route to <bar1:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=21 sp=end dp=end ] +@18 pass from no-route to <bar1:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=21 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass from no-route to <bar2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=21 sp=end dp=end ] +@19 pass from no-route to <bar2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=21 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass from no-route to <bar3:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@20 pass from no-route to <bar3:*> flags S/SA + [ Skip steps: i=end r=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 ] -@21 pass from <foo:*> to <bar1:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@21 pass from <foo:*> to <bar1:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 pass from <foo:*> to <bar2:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] +@22 pass from <foo:*> to <bar2:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 pass from <foo:*> to <bar3:*> flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@23 pass from <foo:*> to <bar3:*> flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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 7cc6c7fc8c5..d0e14960a9b 100644 --- a/regress/sbin/pfctl/pf82.loaded +++ b/regress/sbin/pfctl/pf82.loaded @@ -1,52 +1,52 @@ -@0 pass inet from (lo0:1) to any flags S/SA keep state - [ Skip steps: i=end d=end f=3 p=end sp=end da=end dp=end ] +@0 pass inet from (lo0:1) to any flags S/SA + [ Skip steps: i=end r=end d=end f=3 p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet from ! (lo0:1) to any flags S/SA keep state - [ Skip steps: i=end d=end f=3 p=end sp=end da=end dp=end ] +@1 pass inet from ! (lo0:1) to any flags S/SA + [ Skip steps: i=end r=end d=end f=3 p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet from (lo0:1) to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=4 sp=end da=end dp=end ] +@2 pass inet from (lo0:1) to any flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=4 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass inet6 from (lo0:2) to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@3 pass inet6 from (lo0:2) to any flags S/SA + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass from <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end f=7 p=end sp=end da=end dp=end ] +@4 pass from <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end f=7 p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass from ! <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end f=7 p=end sp=end da=end dp=end ] +@5 pass from ! <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end f=7 p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass from <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@6 pass from <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass inet from <bar:*> to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=9 sp=end da=end dp=end ] +@7 pass inet from <bar:*> to any flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=9 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass from <bar:*> to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@8 pass from <bar:*> to any flags S/SA + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass inet6 from <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=11 sp=end da=end dp=end ] +@9 pass inet6 from <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=11 da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass from <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@10 pass from <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass inet from no-route to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] +@11 pass inet from no-route to any flags S/SA + [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass from no-route to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@12 pass from no-route to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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.ok b/regress/sbin/pfctl/pf82.ok index 4a2071521a3..547cd70e67e 100644 --- a/regress/sbin/pfctl/pf82.ok +++ b/regress/sbin/pfctl/pf82.ok @@ -1,13 +1,13 @@ -pass inet from (lo0) to any flags S/SA keep state -pass inet from ! (lo0) to any flags S/SA keep state -pass inet from (lo0) to any flags S/SA keep state -pass inet6 from (lo0) to any flags S/SA keep state -pass from <foo> to any flags S/SA keep state -pass from ! <foo> to any flags S/SA keep state -pass from <foo> to any flags S/SA keep state -pass inet from <bar> to any flags S/SA keep state -pass from <bar> to any flags S/SA keep state -pass inet6 from <foo> to any flags S/SA keep state -pass from <foo> to any flags S/SA keep state -pass inet from no-route to any flags S/SA keep state -pass from no-route to any flags S/SA keep state +pass inet from (lo0) to any flags S/SA +pass inet from ! (lo0) to any flags S/SA +pass inet from (lo0) to any flags S/SA +pass inet6 from (lo0) to any flags S/SA +pass from <foo> to any flags S/SA +pass from ! <foo> to any flags S/SA +pass from <foo> to any flags S/SA +pass inet from <bar> to any flags S/SA +pass from <bar> to any flags S/SA +pass inet6 from <foo> to any flags S/SA +pass from <foo> to any flags S/SA +pass inet from no-route to any flags S/SA +pass from no-route to any flags S/SA diff --git a/regress/sbin/pfctl/pf82.optimized b/regress/sbin/pfctl/pf82.optimized index 3fa23efa8aa..bd4d57afc50 100644 --- a/regress/sbin/pfctl/pf82.optimized +++ b/regress/sbin/pfctl/pf82.optimized @@ -1,28 +1,28 @@ -@0 pass inet from (lo0:1) to any flags S/SA keep state - [ Skip steps: i=end d=end f=2 p=end sp=end da=end dp=end ] +@0 pass inet from (lo0:1) to any flags S/SA + [ Skip steps: i=end r=end d=end f=2 p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet from ! (lo0:1) to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@1 pass inet from ! (lo0:1) to any flags S/SA + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass inet6 from (lo0:2) to any flags S/SA keep state - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] +@2 pass inet6 from (lo0:2) to any flags S/SA + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass from <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@3 pass from <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass from ! <foo:*> to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@4 pass from ! <foo:*> to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass from <bar:*> to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] +@5 pass from <bar:*> to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass from no-route to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@6 pass from no-route to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf84.loaded b/regress/sbin/pfctl/pf84.loaded index bb07c8bc60e..e3eba071e5a 100644 --- a/regress/sbin/pfctl/pf84.loaded +++ b/regress/sbin/pfctl/pf84.loaded @@ -1,32 +1,32 @@ @0 match out on tun1000000 inet from 10.0.0.0/24 to any nat-to <__automatic_0:2> round-robin sticky-address - [ Skip steps: i=3 f=3 p=3 sp=end dp=3 ] + [ Skip steps: i=3 d=end f=3 p=3 sp=end dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on tun1000000 inet from any to 10.0.1.1 rdr-to 10.0.0.0/24 random sticky-address - [ Skip steps: i=3 d=end f=3 p=3 sa=end sp=end dp=3 ] + [ Skip steps: i=3 r=end d=end f=3 p=3 sa=end sp=end dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on tun1000000 inet from any to 10.0.1.2 rdr-to <__automatic_1:2> round-robin sticky-address - [ Skip steps: d=end sa=end sp=end ] + [ Skip steps: r=end d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in proto tcp from any to any port = ssh flags S/SA keep state (source-track global) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in proto tcp from any to any port = smtp flags S/SA keep state (source-track global) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in proto tcp from any to any port = www flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in proto tcp from any to any port = ntp flags S/SA keep state (source-track rule, max-src-nodes 1000) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in proto tcp from any to any port = 321 flags S/SA keep state (source-track global, max-src-states 3) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf84.optimized b/regress/sbin/pfctl/pf84.optimized index bb07c8bc60e..e3eba071e5a 100644 --- a/regress/sbin/pfctl/pf84.optimized +++ b/regress/sbin/pfctl/pf84.optimized @@ -1,32 +1,32 @@ @0 match out on tun1000000 inet from 10.0.0.0/24 to any nat-to <__automatic_0:2> round-robin sticky-address - [ Skip steps: i=3 f=3 p=3 sp=end dp=3 ] + [ Skip steps: i=3 d=end f=3 p=3 sp=end dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 match in on tun1000000 inet from any to 10.0.1.1 rdr-to 10.0.0.0/24 random sticky-address - [ Skip steps: i=3 d=end f=3 p=3 sa=end sp=end dp=3 ] + [ Skip steps: i=3 r=end d=end f=3 p=3 sa=end sp=end dp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 match in on tun1000000 inet from any to 10.0.1.2 rdr-to <__automatic_1:2> round-robin sticky-address - [ Skip steps: d=end sa=end sp=end ] + [ Skip steps: r=end d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in proto tcp from any to any port = ssh flags S/SA keep state (source-track global) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in proto tcp from any to any port = smtp flags S/SA keep state (source-track global) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in proto tcp from any to any port = www flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in proto tcp from any to any port = ntp flags S/SA keep state (source-track rule, max-src-nodes 1000) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in proto tcp from any to any port = 321 flags S/SA keep state (source-track global, max-src-states 3) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf85.ok b/regress/sbin/pfctl/pf85.ok index 07e71ed5f70..94eab968410 100644 --- a/regress/sbin/pfctl/pf85.ok +++ b/regress/sbin/pfctl/pf85.ok @@ -1,6 +1,6 @@ -pass inet from 127.0.0.1 to any flags S/SA keep state tag 127.0.0.1 -pass inet from 127.0.0.2 to any flags S/SA keep state tag 127.0.0.2 -pass inet from 127.0.0.3 to any flags S/SA keep state tag 127.0.0.3 -pass inet from 127.0.0.1 to any flags S/SA keep state tagged 127.0.0.1 -pass inet from 127.0.0.2 to any flags S/SA keep state tagged 127.0.0.2 -pass inet from 127.0.0.3 to any flags S/SA keep state tagged 127.0.0.3 +pass inet from 127.0.0.1 to any flags S/SA tag 127.0.0.1 +pass inet from 127.0.0.2 to any flags S/SA tag 127.0.0.2 +pass inet from 127.0.0.3 to any flags S/SA tag 127.0.0.3 +pass inet from 127.0.0.1 to any flags S/SA tagged 127.0.0.1 +pass inet from 127.0.0.2 to any flags S/SA tagged 127.0.0.2 +pass inet from 127.0.0.3 to any flags S/SA tagged 127.0.0.3 diff --git a/regress/sbin/pfctl/pf87.loaded b/regress/sbin/pfctl/pf87.loaded index a37ce2eef65..065b99c6270 100644 --- a/regress/sbin/pfctl/pf87.loaded +++ b/regress/sbin/pfctl/pf87.loaded @@ -1,88 +1,88 @@ -@0 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: d=5 f=end p=2 da=2 ] +@0 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: r=5 d=end f=end p=2 da=2 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA keep state - [ Skip steps: i=3 d=5 f=end ] +@1 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA + [ Skip steps: i=3 r=5 d=end f=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain keep state - [ Skip steps: d=5 f=end p=4 sp=9 dp=4 ] +@2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain + [ Skip steps: r=5 d=end f=end p=4 sp=9 dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: d=5 f=end sa=9 sp=9 ] +@3 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: r=5 d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA keep state - [ Skip steps: f=end sa=9 sp=9 ] +@4 pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA + [ Skip steps: d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: f=end sa=9 sp=9 ] +@5 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA keep state - [ Skip steps: i=9 f=end p=8 sa=9 sp=9 ] +@6 pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA + [ Skip steps: i=9 d=end f=end p=8 sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA keep state - [ Skip steps: i=9 f=end sa=9 sp=9 ] +@7 pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA + [ Skip steps: i=9 d=end f=end sa=9 sp=9 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in inet proto udp from any to 10.0.0.3 port = domain keep state - [ Skip steps: d=10 f=end p=13 ] +@8 pass in inet proto udp from any to 10.0.0.3 port = domain + [ Skip steps: r=10 d=end f=end p=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 keep state - [ Skip steps: f=end p=13 ] +@9 pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 + [ Skip steps: d=end f=end p=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass out inet proto udp from any to 10.0.0.1 port = domain keep state - [ Skip steps: d=14 f=end p=13 sa=16 sp=end dp=13 ] +@10 pass out inet proto udp from any to 10.0.0.1 port = domain + [ Skip steps: r=14 d=end f=end p=13 sa=16 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: d=14 f=end p=13 sa=16 sp=end dp=13 ] +@11 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: r=14 d=end f=end p=13 sa=16 sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass out inet proto udp from any to 10.0.0.3 port = domain keep state - [ Skip steps: d=14 f=end sa=16 sp=end ] +@12 pass out inet proto udp from any to 10.0.0.3 port = domain + [ Skip steps: r=14 d=end f=end sa=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: f=end p=15 sa=16 sp=end da=16 dp=15 ] +@13 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: d=end f=end p=15 sa=16 da=16 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: i=18 d=17 f=end sa=16 sp=end da=16 ] +@14 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: i=18 r=17 d=end f=end sa=16 da=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: i=18 d=17 f=end sp=end ] +@15 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: i=18 r=17 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA keep state - [ Skip steps: i=18 f=end p=19 sp=end ] +@16 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA + [ Skip steps: i=18 d=end f=end p=19 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: d=19 f=end p=19 sa=20 sp=end ] +@17 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: r=19 d=end f=end p=19 sa=20 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA keep state - [ Skip steps: i=20 f=end sa=20 sp=end da=20 ] +@18 pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA + [ Skip steps: i=20 d=end f=end sa=20 da=20 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in inet proto udp from any to 10.0.0.1 port = domain keep state - [ Skip steps: d=end f=end sp=end ] +@19 pass in inet proto udp from any to 10.0.0.1 port = domain + [ Skip steps: r=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA keep state - [ Skip steps: i=end d=end f=end sp=end ] +@20 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA + [ Skip steps: i=end r=end d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@21 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf87.ok b/regress/sbin/pfctl/pf87.ok index c598cc110f8..a50c25b26e5 100644 --- a/regress/sbin/pfctl/pf87.ok +++ b/regress/sbin/pfctl/pf87.ok @@ -1,22 +1,22 @@ -pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state -pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA keep state -pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain keep state -pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain keep state -pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA keep state -pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state -pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA keep state -pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA keep state -pass in inet proto udp from any to 10.0.0.3 port = domain keep state -pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 keep state -pass out inet proto udp from any to 10.0.0.1 port = domain keep state -pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain keep state -pass out inet proto udp from any to 10.0.0.3 port = domain keep state -pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state -pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state -pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state -pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA keep state -pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state -pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA keep state -pass in inet proto udp from any to 10.0.0.1 port = domain keep state -pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA keep state -pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 keep state +pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA +pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain +pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain +pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA +pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA +pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA +pass in inet proto udp from any to 10.0.0.3 port = domain +pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 +pass out inet proto udp from any to 10.0.0.1 port = domain +pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain +pass out inet proto udp from any to 10.0.0.3 port = domain +pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain +pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA +pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA +pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA +pass in inet proto udp from any to 10.0.0.1 port = domain +pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA +pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 diff --git a/regress/sbin/pfctl/pf87.optimized b/regress/sbin/pfctl/pf87.optimized index d5121a46b32..d3bec92523b 100644 --- a/regress/sbin/pfctl/pf87.optimized +++ b/regress/sbin/pfctl/pf87.optimized @@ -1,88 +1,88 @@ -@0 pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 keep state - [ Skip steps: i=8 d=14 f=end p=3 da=5 ] +@0 pass in on lo1000001 inet proto udp from 10.0.0.2 port = domain to 10.0.0.2 + [ Skip steps: i=8 r=14 d=end f=end p=3 da=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: i=8 d=14 f=end p=3 sp=3 da=5 ] +@1 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: i=8 r=14 d=end f=end p=3 da=5 sp=3 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 keep state - [ Skip steps: i=8 d=14 f=end da=5 dp=4 ] +@2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2 + [ Skip steps: i=8 r=14 d=end f=end da=5 dp=4 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA keep state - [ Skip steps: i=8 d=14 f=end p=7 da=5 ] +@3 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = ssh to 10.0.0.2 flags S/SA + [ Skip steps: i=8 r=14 d=end f=end p=7 da=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: i=8 d=14 f=end p=7 sp=end ] +@4 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: i=8 r=14 d=end f=end p=7 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA keep state - [ Skip steps: i=8 d=14 f=end p=7 sa=7 sp=end ] +@5 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA + [ Skip steps: i=8 r=14 d=end f=end p=7 sa=7 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA keep state - [ Skip steps: i=8 d=14 f=end sp=end ] +@6 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = ssh flags S/SA + [ Skip steps: i=8 r=14 d=end f=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain keep state - [ Skip steps: d=14 f=end p=11 sp=end dp=11 ] +@7 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = domain + [ Skip steps: r=14 d=end f=end p=11 sp=end dp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: d=14 f=end p=11 sa=end sp=end dp=11 ] +@8 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: r=14 d=end f=end p=11 sa=end sp=end dp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass in inet proto udp from any to 10.0.0.3 port = domain keep state - [ Skip steps: i=13 d=14 f=end p=11 sa=end sp=end dp=11 ] +@9 pass in inet proto udp from any to 10.0.0.3 port = domain + [ Skip steps: i=13 r=14 d=end f=end p=11 sa=end sp=end dp=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass in inet proto udp from any to 10.0.0.1 port = domain keep state - [ Skip steps: i=13 d=14 f=end sa=end sp=end da=12 ] +@10 pass in inet proto udp from any to 10.0.0.1 port = domain + [ Skip steps: i=13 r=14 d=end f=end sa=end da=12 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA keep state - [ Skip steps: i=13 d=14 f=end p=14 sa=end sp=end dp=13 ] +@11 pass in inet proto tcp from any to 10.0.0.1 port = www flags S/SA + [ Skip steps: i=13 r=14 d=end f=end p=14 sa=end sp=end dp=13 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA keep state - [ Skip steps: d=14 f=end p=14 sa=end sp=end ] +@12 pass in inet proto tcp from any to 10.0.0.3 port = www flags S/SA + [ Skip steps: r=14 d=end f=end p=14 sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: f=end sa=end sp=end da=16 ] +@13 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: d=end f=end sa=end da=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: d=end f=end p=18 sa=end sp=end da=16 dp=18 ] +@14 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: r=end d=end f=end p=18 sa=end da=16 sp=end dp=18 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain keep state - [ Skip steps: d=end f=end p=18 sa=end sp=end dp=18 ] +@15 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = domain + [ Skip steps: r=end d=end f=end p=18 sa=end sp=end dp=18 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass out inet proto udp from any to 10.0.0.1 port = domain keep state - [ Skip steps: i=18 d=end f=end p=18 sa=end sp=end dp=18 ] +@16 pass out inet proto udp from any to 10.0.0.1 port = domain + [ Skip steps: i=18 r=end d=end f=end p=18 sa=end sp=end dp=18 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass out inet proto udp from any to 10.0.0.3 port = domain keep state - [ Skip steps: d=end f=end sa=end sp=end ] +@17 pass out inet proto udp from any to 10.0.0.3 port = domain + [ Skip steps: r=end d=end f=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: d=end f=end p=end sa=end sp=end da=20 dp=20 ] +@18 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: r=end d=end f=end p=end sa=end da=20 sp=end dp=20 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state - [ Skip steps: d=end f=end p=end sa=end sp=end ] +@19 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA + [ Skip steps: r=end d=end f=end p=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@20 pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@21 pass out inet proto tcp from any to 10.0.0.1 port = www flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf88.loaded b/regress/sbin/pfctl/pf88.loaded index 7d44a2961e4..8f949abb42b 100644 --- a/regress/sbin/pfctl/pf88.loaded +++ b/regress/sbin/pfctl/pf88.loaded @@ -1,88 +1,88 @@ -@0 pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state - [ Skip steps: i=2 d=2 f=2 p=14 sa=10 sp=end da=2 dp=15 ] +@0 pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA + [ Skip steps: i=2 r=2 d=end f=2 p=14 sa=10 da=2 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state - [ Skip steps: p=14 sa=10 sp=end dp=15 ] +@1 pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA + [ Skip steps: d=end p=14 sa=10 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass all flags S/SA keep state - [ Skip steps: i=6 f=6 p=14 sa=10 sp=end da=6 dp=15 ] +@2 pass all flags S/SA + [ Skip steps: i=6 d=end f=6 p=14 sa=10 da=6 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out all flags S/SA keep state - [ Skip steps: i=6 d=6 f=6 p=14 sa=10 sp=end da=6 dp=15 ] +@3 pass out all flags S/SA + [ Skip steps: i=6 r=6 d=end f=6 p=14 sa=10 da=6 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out all flags S/SA keep state - [ Skip steps: i=6 d=6 f=6 p=14 sa=10 sp=end da=6 dp=15 ] +@4 pass out all flags S/SA + [ Skip steps: i=6 r=6 d=end f=6 p=14 sa=10 da=6 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass out quick all flags S/SA keep state - [ Skip steps: p=14 sa=10 sp=end dp=15 ] +@5 pass out quick all flags S/SA + [ Skip steps: d=end p=14 sa=10 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 pass on lo1000001 inet from any to 10.0.0.1 flags S/SA keep state - [ Skip steps: d=14 f=16 p=14 sa=10 sp=end da=8 dp=15 ] +@6 pass on lo1000001 inet from any to 10.0.0.1 flags S/SA + [ Skip steps: r=14 d=end f=16 p=14 sa=10 da=8 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 pass on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state - [ Skip steps: d=14 f=16 p=14 sa=10 sp=end dp=15 ] +@7 pass on lo1000000 inet from any to 10.0.0.1 flags S/SA + [ Skip steps: r=14 d=end f=16 p=14 sa=10 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass inet from any to 10.0.0.2 flags S/SA modulate state - [ Skip steps: i=18 d=14 f=16 p=14 sa=10 sp=end da=14 dp=15 ] + [ Skip steps: i=18 r=14 d=end f=16 p=14 sa=10 da=14 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 pass inet from any to 10.0.0.2 flags S/SA keep state - [ Skip steps: i=18 d=14 f=16 p=14 sp=end da=14 dp=15 ] +@9 pass inet from any to 10.0.0.2 flags S/SA + [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop inet from 10.0.0.3 to 10.0.0.2 - [ Skip steps: i=18 d=14 f=16 p=14 sp=end da=14 dp=15 ] + [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 pass inet from any to 10.0.0.2 flags S/SA modulate state - [ Skip steps: i=18 d=14 f=16 p=14 sp=end da=14 dp=15 ] + [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop inet from 10.0.0.3 to 10.0.0.2 - [ Skip steps: i=18 d=14 f=16 p=14 sp=end da=14 dp=15 ] + [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 pass inet from any to 10.0.0.2 flags S/SA synproxy state - [ Skip steps: i=18 f=16 sp=end dp=15 ] + [ Skip steps: i=18 d=end f=16 sp=end dp=15 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 flags S/SA keep state - [ Skip steps: i=18 d=17 f=16 p=16 sa=16 sp=end da=16 ] +@14 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 flags S/SA + [ Skip steps: i=18 r=17 d=end f=16 p=16 sa=16 da=16 sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = www flags S/SA keep state - [ Skip steps: i=18 d=17 sp=end ] +@15 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = www flags S/SA + [ Skip steps: i=18 r=17 d=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 pass out all flags S/SA keep state - [ Skip steps: i=18 f=end p=end sa=end sp=end da=end dp=end ] +@16 pass out all flags S/SA + [ Skip steps: i=18 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 pass in all flags S/SA keep state - [ Skip steps: d=21 f=end p=end sa=end sp=end da=end dp=end ] +@17 pass in all flags S/SA + [ Skip steps: r=21 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 pass in on lo1000001 all flags S/SA keep state - [ Skip steps: i=21 d=21 f=end p=end sa=end sp=end da=end dp=end ] +@18 pass in on lo1000001 all flags S/SA + [ Skip steps: i=21 r=21 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 pass in on lo1000001 all flags S/SA keep state - [ Skip steps: i=21 d=21 f=end p=end sa=end sp=end da=end dp=end ] +@19 pass in on lo1000001 all flags S/SA + [ Skip steps: i=21 r=21 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 pass in on lo1000001 all flags S/SA keep state - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] +@20 pass in on lo1000001 all flags S/SA + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 block drop all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf88.ok b/regress/sbin/pfctl/pf88.ok index dcebcb5cefd..9b8997134cb 100644 --- a/regress/sbin/pfctl/pf88.ok +++ b/regress/sbin/pfctl/pf88.ok @@ -1,22 +1,22 @@ -pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state -pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state -pass all flags S/SA keep state -pass out all flags S/SA keep state -pass out all flags S/SA keep state -pass out quick all flags S/SA keep state -pass on lo1000001 inet from any to 10.0.0.1 flags S/SA keep state -pass on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state +pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA +pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA +pass all flags S/SA +pass out all flags S/SA +pass out all flags S/SA +pass out quick all flags S/SA +pass on lo1000001 inet from any to 10.0.0.1 flags S/SA +pass on lo1000000 inet from any to 10.0.0.1 flags S/SA pass inet from any to 10.0.0.2 flags S/SA modulate state -pass inet from any to 10.0.0.2 flags S/SA keep state +pass inet from any to 10.0.0.2 flags S/SA block drop inet from 10.0.0.3 to 10.0.0.2 pass inet from any to 10.0.0.2 flags S/SA modulate state block drop inet from 10.0.0.3 to 10.0.0.2 pass inet from any to 10.0.0.2 flags S/SA synproxy state -pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 flags S/SA keep state -pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = www flags S/SA keep state -pass out all flags S/SA keep state -pass in all flags S/SA keep state -pass in on lo1000001 all flags S/SA keep state -pass in on lo1000001 all flags S/SA keep state -pass in on lo1000001 all flags S/SA keep state +pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 flags S/SA +pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = www flags S/SA +pass out all flags S/SA +pass in all flags S/SA +pass in on lo1000001 all flags S/SA +pass in on lo1000001 all flags S/SA +pass in on lo1000001 all flags S/SA block drop all diff --git a/regress/sbin/pfctl/pf88.optimized b/regress/sbin/pfctl/pf88.optimized index ab9a967da08..8681fd3fc9f 100644 --- a/regress/sbin/pfctl/pf88.optimized +++ b/regress/sbin/pfctl/pf88.optimized @@ -1,52 +1,52 @@ -@0 pass all flags S/SA keep state - [ Skip steps: i=2 f=2 p=end sa=6 sp=end da=2 dp=end ] +@0 pass all flags S/SA + [ Skip steps: i=2 d=end f=2 p=end sa=6 da=2 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass out quick all flags S/SA keep state - [ Skip steps: p=end sa=6 sp=end dp=end ] +@1 pass out quick all flags S/SA + [ Skip steps: 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 ] -@2 pass on lo1000001 inet from any to 10.0.0.1 flags S/SA keep state - [ Skip steps: d=10 f=10 p=end sa=6 sp=end da=4 dp=end ] +@2 pass on lo1000001 inet from any to 10.0.0.1 flags S/SA + [ Skip steps: r=10 d=end f=10 p=end sa=6 da=4 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass on lo1000000 inet from any to 10.0.0.1 flags S/SA keep state - [ Skip steps: d=10 f=10 p=end sa=6 sp=end dp=end ] +@3 pass on lo1000000 inet from any to 10.0.0.1 flags S/SA + [ Skip steps: r=10 d=end f=10 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 any to 10.0.0.2 flags S/SA modulate state - [ Skip steps: i=end d=10 f=10 p=end sa=6 sp=end da=10 dp=end ] + [ Skip steps: i=end r=10 d=end f=10 p=end sa=6 da=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 pass inet from any to 10.0.0.2 flags S/SA keep state - [ Skip steps: i=end d=10 f=10 p=end sp=end da=10 dp=end ] +@5 pass inet from any to 10.0.0.2 flags S/SA + [ Skip steps: i=end r=10 d=end f=10 p=end da=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop inet from 10.0.0.3 to 10.0.0.2 - [ Skip steps: i=end d=10 f=10 p=end sp=end da=10 dp=end ] + [ Skip steps: i=end r=10 d=end f=10 p=end da=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass inet from any to 10.0.0.2 flags S/SA modulate state - [ Skip steps: i=end d=10 f=10 p=end sp=end da=10 dp=end ] + [ Skip steps: i=end r=10 d=end f=10 p=end da=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop inet from 10.0.0.3 to 10.0.0.2 - [ Skip steps: i=end d=10 f=10 p=end sp=end da=10 dp=end ] + [ Skip steps: i=end r=10 d=end f=10 p=end da=10 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 pass inet from any to 10.0.0.2 flags S/SA synproxy state - [ Skip steps: i=end p=end sa=end sp=end dp=end ] + [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 pass out all flags S/SA keep state - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@10 pass out all flags S/SA + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 pass in all flags S/SA keep state - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@11 pass in all flags S/SA + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf89.loaded b/regress/sbin/pfctl/pf89.loaded index 72fa1d69dd7..7f0c349fd53 100644 --- a/regress/sbin/pfctl/pf89.loaded +++ b/regress/sbin/pfctl/pf89.loaded @@ -1,40 +1,40 @@ @0 block drop all - [ Skip steps: i=5 d=2 f=5 p=2 sp=end da=5 dp=5 ] + [ Skip steps: i=5 r=2 d=end f=5 p=2 da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop quick from <bad:0> to any - [ Skip steps: i=5 f=5 sp=end da=5 dp=5 ] + [ Skip steps: i=5 d=end f=5 da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out proto tcp all flags S/SA keep state - [ Skip steps: i=5 d=5 f=5 sa=end sp=end da=5 dp=5 ] +@2 pass out proto tcp all flags S/SA + [ Skip steps: i=5 r=5 d=end f=5 sa=end da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out proto icmp all keep state - [ Skip steps: i=5 d=5 f=5 sa=end sp=end da=5 dp=5 ] +@3 pass out proto icmp all + [ Skip steps: i=5 r=5 d=end f=5 sa=end da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out proto udp all keep state - [ Skip steps: sa=end sp=end ] +@4 pass out proto udp all + [ Skip steps: d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) - [ Skip steps: i=8 d=end f=end p=end sa=end sp=end dp=8 ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10) - [ Skip steps: i=8 d=end f=end p=end sa=end sp=end dp=8 ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) - [ Skip steps: d=end f=end p=end sa=end sp=end ] + [ Skip steps: r=end d=end f=end p=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = www flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 8080 flags S/SA synproxy state (source-track rule, max-src-conn 1000, max-src-conn-rate 1000/5, overload <bad> flush global, src.track 5) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf89.ok b/regress/sbin/pfctl/pf89.ok index e66f5f89f5d..a5aa5f426eb 100644 --- a/regress/sbin/pfctl/pf89.ok +++ b/regress/sbin/pfctl/pf89.ok @@ -1,9 +1,9 @@ table <bad> persist block drop all block drop quick from <bad> to any -pass out proto tcp all flags S/SA keep state -pass out proto icmp all keep state -pass out proto udp all keep state +pass out proto tcp all flags S/SA +pass out proto icmp all +pass out proto udp all pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10) pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) diff --git a/regress/sbin/pfctl/pf89.optimized b/regress/sbin/pfctl/pf89.optimized index 72fa1d69dd7..7f0c349fd53 100644 --- a/regress/sbin/pfctl/pf89.optimized +++ b/regress/sbin/pfctl/pf89.optimized @@ -1,40 +1,40 @@ @0 block drop all - [ Skip steps: i=5 d=2 f=5 p=2 sp=end da=5 dp=5 ] + [ Skip steps: i=5 r=2 d=end f=5 p=2 da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop quick from <bad:0> to any - [ Skip steps: i=5 f=5 sp=end da=5 dp=5 ] + [ Skip steps: i=5 d=end f=5 da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass out proto tcp all flags S/SA keep state - [ Skip steps: i=5 d=5 f=5 sa=end sp=end da=5 dp=5 ] +@2 pass out proto tcp all flags S/SA + [ Skip steps: i=5 r=5 d=end f=5 sa=end da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 pass out proto icmp all keep state - [ Skip steps: i=5 d=5 f=5 sa=end sp=end da=5 dp=5 ] +@3 pass out proto icmp all + [ Skip steps: i=5 r=5 d=end f=5 sa=end da=5 sp=end dp=5 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 pass out proto udp all keep state - [ Skip steps: sa=end sp=end ] +@4 pass out proto udp all + [ Skip steps: d=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99) - [ Skip steps: i=8 d=end f=end p=end sa=end sp=end dp=8 ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10) - [ Skip steps: i=8 d=end f=end p=end sa=end sp=end dp=8 ] + [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99) - [ Skip steps: d=end f=end p=end sa=end sp=end ] + [ Skip steps: r=end d=end f=end p=end sa=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = www flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 8080 flags S/SA synproxy state (source-track rule, max-src-conn 1000, max-src-conn-rate 1000/5, overload <bad> flush global, src.track 5) - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf9.loaded b/regress/sbin/pfctl/pf9.loaded index 8c6247c4e7f..a0cd69d1487 100644 --- a/regress/sbin/pfctl/pf9.loaded +++ b/regress/sbin/pfctl/pf9.loaded @@ -1,8 +1,8 @@ @0 block drop in on enc0 all - [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in on tun1000000 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf9.optimized b/regress/sbin/pfctl/pf9.optimized index 8c6247c4e7f..a0cd69d1487 100644 --- a/regress/sbin/pfctl/pf9.optimized +++ b/regress/sbin/pfctl/pf9.optimized @@ -1,8 +1,8 @@ @0 block drop in on enc0 all - [ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in on tun1000000 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf90.loaded b/regress/sbin/pfctl/pf90.loaded index 74dd8bebc6e..5029e303adc 100644 --- a/regress/sbin/pfctl/pf90.loaded +++ b/regress/sbin/pfctl/pf90.loaded @@ -1,20 +1,20 @@ -@0 pass log (user) all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass log (user) all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass log (all) all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass log (all) all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass log (to pflog7) all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass log (to pflog7) all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop log (all, user, to pflog1) all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop log (user, to pflog1) all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf90.ok b/regress/sbin/pfctl/pf90.ok index 4255dc356c4..9709821bdf5 100644 --- a/regress/sbin/pfctl/pf90.ok +++ b/regress/sbin/pfctl/pf90.ok @@ -1,5 +1,5 @@ -pass log (user) all flags S/SA keep state -pass log (all) all flags S/SA keep state -pass log (to pflog7) all flags S/SA keep state +pass log (user) all flags S/SA +pass log (all) all flags S/SA +pass log (to pflog7) all flags S/SA block drop log (all, user, to pflog1) all block drop log (user, to pflog1) all diff --git a/regress/sbin/pfctl/pf90.optimized b/regress/sbin/pfctl/pf90.optimized index 74dd8bebc6e..5029e303adc 100644 --- a/regress/sbin/pfctl/pf90.optimized +++ b/regress/sbin/pfctl/pf90.optimized @@ -1,20 +1,20 @@ -@0 pass log (user) all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass log (user) all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass log (all) all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass log (all) all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 pass log (to pflog7) all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass log (to pflog7) all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop log (all, user, to pflog1) all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop log (user, to pflog1) all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf91.loaded b/regress/sbin/pfctl/pf91.loaded index b1a0b910dfa..56b94070c1b 100644 --- a/regress/sbin/pfctl/pf91.loaded +++ b/regress/sbin/pfctl/pf91.loaded @@ -1,31 +1,31 @@ @0 anchor on tun1000000 all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor "foo" out all { - [ Skip steps: i=end f=end sa=end sp=end da=end ] + [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass proto tcp from any to any port = 1234 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] +@0 pass proto tcp from any to any port = 1234 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 anchor proto tcp from any to any port = 2413 user = 0 label "foo" { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 block drop all - [ Skip steps: i=end d=end p=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass inet from 127.0.0.1 to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass inet from 127.0.0.1 to any flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } } -@1 pass in proto tcp from any to any port = 1234 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in proto tcp from any to any port = 1234 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf91.ok b/regress/sbin/pfctl/pf91.ok index 9f69e272d7f..305667be4a2 100644 --- a/regress/sbin/pfctl/pf91.ok +++ b/regress/sbin/pfctl/pf91.ok @@ -1,10 +1,10 @@ anchor on tun1000000 all { anchor "foo" out all { - pass proto tcp from any to any port = 1234 flags S/SA keep state + pass proto tcp from any to any port = 1234 flags S/SA anchor proto tcp from any to any port = 2413 user = 0 label "foo" { block drop all - pass inet from 127.0.0.1 to any flags S/SA keep state + pass inet from 127.0.0.1 to any flags S/SA } } - pass in proto tcp from any to any port = 1234 flags S/SA keep state + pass in proto tcp from any to any port = 1234 flags S/SA } diff --git a/regress/sbin/pfctl/pf91.optimized b/regress/sbin/pfctl/pf91.optimized index 83e3c63212f..4e99df4f69e 100644 --- a/regress/sbin/pfctl/pf91.optimized +++ b/regress/sbin/pfctl/pf91.optimized @@ -1,13 +1,13 @@ @0 anchor on tun1000000 all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor "foo" out all - [ Skip steps: i=end f=end sa=end sp=end da=end ] + [ Skip steps: i=end d=end f=end sa=end da=end sp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 pass in proto tcp from any to any port = 1234 flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass in proto tcp from any to any port = 1234 flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf92.loaded b/regress/sbin/pfctl/pf92.loaded index 6a4e1a462f3..8d9dfb74edf 100644 --- a/regress/sbin/pfctl/pf92.loaded +++ b/regress/sbin/pfctl/pf92.loaded @@ -1,50 +1,50 @@ @0 anchor all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=2 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=2 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass quick all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass quick all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @1 anchor out all { - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor out all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor out all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor out all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @@ -55,16 +55,16 @@ } } } -@2 pass in on tun1000000 all flags S/SA keep state - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on tun1000000 all flags S/SA + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 anchor "foo" on tun1000000 all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf92.ok b/regress/sbin/pfctl/pf92.ok index 43720c1afa2..bd4bf1998ee 100644 --- a/regress/sbin/pfctl/pf92.ok +++ b/regress/sbin/pfctl/pf92.ok @@ -1,6 +1,6 @@ anchor all { anchor in all { - pass quick all flags S/SA keep state + pass quick all flags S/SA } anchor out all { anchor in all { @@ -10,7 +10,7 @@ anchor all { anchor in all { anchor out all { anchor in all { - pass all flags S/SA keep state + pass all flags S/SA } } } @@ -19,8 +19,8 @@ anchor all { } } } - pass in on tun1000000 all flags S/SA keep state + pass in on tun1000000 all flags S/SA anchor "foo" on tun1000000 all { - pass all flags S/SA keep state + pass all flags S/SA } } diff --git a/regress/sbin/pfctl/pf92.optimized b/regress/sbin/pfctl/pf92.optimized index 206f1c52ab6..8913326070e 100644 --- a/regress/sbin/pfctl/pf92.optimized +++ b/regress/sbin/pfctl/pf92.optimized @@ -1,50 +1,50 @@ @0 anchor all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=2 f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=2 d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass quick all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass quick all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @1 anchor out all { - [ Skip steps: f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor out all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor out all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor out all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 anchor in all { - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@0 pass all flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@0 pass all flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] } @@ -55,12 +55,12 @@ } } } -@2 pass in on tun1000000 all flags S/SA keep state - [ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] +@2 pass in on tun1000000 all flags S/SA + [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 anchor "foo" on tun1000000 all - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf93.ok b/regress/sbin/pfctl/pf93.ok index 6381b9aaca2..b76eb4c1033 100644 --- a/regress/sbin/pfctl/pf93.ok +++ b/regress/sbin/pfctl/pf93.ok @@ -1 +1 @@ -pass in all flags S/SA keep state rtable 7 +pass in all flags S/SA rtable 7 diff --git a/regress/sbin/pfctl/pf94.ok b/regress/sbin/pfctl/pf94.ok index 5a792644def..ca1964e4e08 100644 --- a/regress/sbin/pfctl/pf94.ok +++ b/regress/sbin/pfctl/pf94.ok @@ -1,4 +1,4 @@ -pass inet from 10.1.2.3 - 10.1.2.4 to 10.2.3.4 - 10.3.4.5 flags S/SA keep state -pass inet from 0.0.0.0 - 255.255.255.255 to any flags S/SA keep state -pass inet6 from 2001:6f8:1098::2 - 2001:6f8:1098::5 to 2001:6f8:1098::3 - 2001:6f8:1098::4 flags S/SA keep state -pass inet6 from :: - ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff to any flags S/SA keep state +pass inet from 10.1.2.3 - 10.1.2.4 to 10.2.3.4 - 10.3.4.5 flags S/SA +pass inet from 0.0.0.0 - 255.255.255.255 to any flags S/SA +pass inet6 from 2001:6f8:1098::2 - 2001:6f8:1098::5 to 2001:6f8:1098::3 - 2001:6f8:1098::4 flags S/SA +pass inet6 from :: - ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff to any flags S/SA diff --git a/regress/sbin/pfctl/pf96.ok b/regress/sbin/pfctl/pf96.ok index e1d9efe31f9..935b2bc077f 100644 --- a/regress/sbin/pfctl/pf96.ok +++ b/regress/sbin/pfctl/pf96.ok @@ -1,5 +1,5 @@ myports = "5555 6666" moreports = "5555 6666 7777" -pass in proto tcp from any to any port = 5555 flags S/SA keep state -pass in proto tcp from any to any port = 6666 flags S/SA keep state -pass in proto tcp from any to any port = 7777 flags S/SA keep state +pass in proto tcp from any to any port = 5555 flags S/SA +pass in proto tcp from any to any port = 6666 flags S/SA +pass in proto tcp from any to any port = 7777 flags S/SA diff --git a/regress/sbin/pfctl/pf97.ok b/regress/sbin/pfctl/pf97.ok index f81acb2d023..c452edf606e 100644 --- a/regress/sbin/pfctl/pf97.ok +++ b/regress/sbin/pfctl/pf97.ok @@ -1,4 +1,4 @@ -pass in on em0 inet proto tcp from any to any port 220:230 flags S/SA keep state divert-to 127.0.0.1 port 22 -pass out on em0 inet proto tcp from any to any port 220:230 flags S/SA keep state divert-reply -pass on em0 inet proto tcp from any to any port = www flags S/SA keep state divert-to 127.0.0.1 port 8080 -pass in on em0 inet proto pim all keep state divert-to 127.0.0.1 port 103 +pass in on em0 inet proto tcp from any to any port 220:230 flags S/SA divert-to 127.0.0.1 port 22 +pass out on em0 inet proto tcp from any to any port 220:230 flags S/SA divert-reply +pass on em0 inet proto tcp from any to any port = www flags S/SA divert-to 127.0.0.1 port 8080 +pass in on em0 inet proto pim all divert-to 127.0.0.1 port 103 diff --git a/regress/sbin/pfctl/pf98.ok b/regress/sbin/pfctl/pf98.ok index f436ebb4701..552be45e463 100644 --- a/regress/sbin/pfctl/pf98.ok +++ b/regress/sbin/pfctl/pf98.ok @@ -1,2 +1,3 @@ -pass in on lo1000000 all flags S/SA keep state -match out on lo0 inet all nat-to 127.0.0.1 +table <__automatic_0> const { ::1 fe80::1 } +pass in on lo1000000 all flags S/SA +match out on lo0 inet6 all nat-to <__automatic_0> round-robin diff --git a/regress/sbin/pfctl/pf99.loaded b/regress/sbin/pfctl/pf99.loaded index ece6740f446..881fc5a3153 100644 --- a/regress/sbin/pfctl/pf99.loaded +++ b/regress/sbin/pfctl/pf99.loaded @@ -1,8 +1,8 @@ -@0 pass from route "foo" to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@0 pass from route "foo" to any flags S/SA + [ Skip steps: i=end r=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 ] -@1 pass from any to route "bar" flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass from any to route "bar" flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pf99.ok b/regress/sbin/pfctl/pf99.ok index 5c34286b085..90e0ae41d66 100644 --- a/regress/sbin/pfctl/pf99.ok +++ b/regress/sbin/pfctl/pf99.ok @@ -1,2 +1,2 @@ -pass from route "foo" to any flags S/SA keep state -pass from any to route "bar" flags S/SA keep state +pass from route "foo" to any flags S/SA +pass from any to route "bar" flags S/SA diff --git a/regress/sbin/pfctl/pf99.optimized b/regress/sbin/pfctl/pf99.optimized index ece6740f446..881fc5a3153 100644 --- a/regress/sbin/pfctl/pf99.optimized +++ b/regress/sbin/pfctl/pf99.optimized @@ -1,8 +1,8 @@ -@0 pass from route "foo" to any flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sp=end dp=end ] +@0 pass from route "foo" to any flags S/SA + [ Skip steps: i=end r=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 ] -@1 pass from any to route "bar" flags S/SA keep state - [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] +@1 pass from any to route "bar" flags S/SA + [ Skip steps: i=end r=end d=end f=end p=end sa=end da=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/pfopt6.ok b/regress/sbin/pfctl/pfopt6.ok index 43720c1afa2..bd4bf1998ee 100644 --- a/regress/sbin/pfctl/pfopt6.ok +++ b/regress/sbin/pfctl/pfopt6.ok @@ -1,6 +1,6 @@ anchor all { anchor in all { - pass quick all flags S/SA keep state + pass quick all flags S/SA } anchor out all { anchor in all { @@ -10,7 +10,7 @@ anchor all { anchor in all { anchor out all { anchor in all { - pass all flags S/SA keep state + pass all flags S/SA } } } @@ -19,8 +19,8 @@ anchor all { } } } - pass in on tun1000000 all flags S/SA keep state + pass in on tun1000000 all flags S/SA anchor "foo" on tun1000000 all { - pass all flags S/SA keep state + pass all flags S/SA } } |