diff options
| author | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2003-01-01 04:26:20 +0000 |
|---|---|---|
| committer | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2003-01-01 04:26:20 +0000 |
| commit | 626d51248cdbdeaa078bb57c95996cb2d563e0a2 (patch) | |
| tree | cfb90b43e73eb8399cc0d222461e81467ed3a88a | |
| parent | e300501e7576c62a5beade4ef35433795899472f (diff) | |
Remove skip step for action (scrub vs. non-scrub), as scrub rules are
stored in a separate list now. Regress tests still pass after
sed "s/ a=end / /g", other skip steps are not affected.
36 files changed, 329 insertions, 347 deletions
diff --git a/regress/sbin/pfctl/pf1.loaded b/regress/sbin/pfctl/pf1.loaded index ad29f294104..8b2c3953f85 100644 --- a/regress/sbin/pfctl/pf1.loaded +++ b/regress/sbin/pfctl/pf1.loaded @@ -1,32 +1,32 @@ @0 pass in all -[ Skip steps: a=end i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ] +[ Skip steps: i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in all -[ Skip steps: a=end i=end d=end f=4 sa=4 da=4 dp=3 ] +[ Skip steps: i=end d=end f=4 sa=4 da=4 dp=3 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in proto tcp from any port <= 1024 to any label foo_bar -[ Skip steps: a=end i=end d=end f=4 p=5 sa=4 da=4 ] +[ Skip steps: i=end d=end f=4 p=5 sa=4 da=4 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in proto tcp from any to any port = smtp -[ Skip steps: a=end i=end d=end p=5 ] +[ Skip steps: i=end d=end p=5 ] [ 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 -[ Skip steps: a=end i=end d=end f=end sa=6 ] +[ Skip steps: i=end d=end f=end sa=6 ] [ 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 allow-opts -[ Skip steps: a=end i=end d=end f=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in inet proto tcp from 1.2.3.4 to any label 6:tcp:1.2.3.4::any: -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in inet proto tcp from 1.2.3.5 to any label 7:tcp:1.2.3.5::any: -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf10.loaded b/regress/sbin/pfctl/pf10.loaded index f04bc643779..6fe063447bf 100644 --- a/regress/sbin/pfctl/pf10.loaded +++ b/regress/sbin/pfctl/pf10.loaded @@ -1,120 +1,120 @@ @0 pass in inet proto icmp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in inet proto icmp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-rst in inet proto tcp all -[ Skip steps: a=end i=end d=end p=8 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-rst in inet6 proto tcp all -[ Skip steps: a=end i=end d=end p=8 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block return-rst(ttl 10) in inet proto tcp all -[ Skip steps: a=end i=end d=end p=8 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block return-rst(ttl 10) in inet6 proto tcp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block return-icmp(port-unr) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block return-icmp(net-unr) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block return-icmp(net-unr) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block return-icmp(srcfail) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block return-icmp(srcfail) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block return-icmp(host-prohib) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block return-icmp(host-prohib) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 block return-icmp(cutoff-preced) in inet proto icmp all -[ Skip steps: a=end i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=17 p=17 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 block return-icmp(cutoff-preced) in inet proto icmp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=28 p=28 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 block return-icmp(srcfail, admin-unr) in all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 block return-icmp(srcfail, admin-unr) in all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf11.loaded b/regress/sbin/pfctl/pf11.loaded index c758ef4e652..2a04d6ec5bb 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 -[ Skip steps: a=end i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in inet proto icmp all icmp-type echorep code 0 -[ Skip steps: a=end i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in inet proto icmp all icmp-type 1 -[ Skip steps: a=end i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=4 p=4 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in inet proto icmp all icmp-type 1 code 1 -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in inet6 proto ipv6-icmp all icmp6-type 0 -[ Skip steps: a=end i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0 -[ Skip steps: a=end i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in inet6 proto ipv6-icmp all icmp6-type unreach -[ Skip steps: a=end i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=8 p=8 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in inet proto icmp all icmp-type echorep -[ Skip steps: a=end i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in inet proto icmp all icmp-type echorep code 0 -[ Skip steps: a=end i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in inet proto icmp all icmp-type 1 -[ Skip steps: a=end i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=12 p=12 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in inet proto icmp all icmp-type 1 code 1 -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in inet6 proto ipv6-icmp all icmp6-type 0 -[ Skip steps: a=end i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0 -[ Skip steps: a=end i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop in inet6 proto ipv6-icmp all icmp6-type unreach -[ Skip steps: a=end i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=16 p=16 sa=end sp=end da=end dp=end ] [ 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: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 pass in inet proto icmp all icmp-type unreach code needfrag -[ Skip steps: a=end i=end d=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf12.loaded b/regress/sbin/pfctl/pf12.loaded index 6eb1c96a042..1d807d2632b 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 -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf13.loaded b/regress/sbin/pfctl/pf13.loaded index 87d6ed6d82e..eebc8655f34 100644 --- a/regress/sbin/pfctl/pf13.loaded +++ b/regress/sbin/pfctl/pf13.loaded @@ -1,64 +1,64 @@ @0 pass in quick on enc0 fastroute all -[ Skip steps: a=end i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ] +[ Skip steps: i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in quick on enc0 fastroute inet all -[ Skip steps: a=end i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ] +[ Skip steps: i=3 d=3 p=6 sa=8 sp=end da=4 dp=6 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in quick on enc0 fastroute inet6 all -[ Skip steps: a=end p=6 sa=8 sp=end da=4 dp=6 ] +[ Skip steps: p=6 sa=8 sp=end da=4 dp=6 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass out quick on tun0 route-to tun1 inet all -[ Skip steps: a=end i=end d=6 f=5 p=6 sa=8 sp=end dp=6 ] +[ Skip steps: i=end d=6 f=5 p=6 sa=8 sp=end dp=6 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass out quick on tun0 route-to tun1 inet from any to 192.168.1.1 -[ Skip steps: a=end i=end d=6 p=6 sa=8 sp=end dp=6 ] +[ Skip steps: i=end d=6 p=6 sa=8 sp=end dp=6 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass out quick on tun0 route-to tun1 inet6 from any to fec0::1 -[ Skip steps: a=end i=end sa=8 sp=end ] +[ Skip steps: i=end sa=8 sp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in on tun0 dup-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp -[ Skip steps: a=end i=end d=end p=8 sa=8 sp=end da=8 dp=8 ] +[ Skip steps: i=end d=end p=8 sa=8 sp=end da=8 dp=8 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in on tun0 dup-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp -[ Skip steps: a=end i=end d=end sp=end ] +[ Skip steps: i=end d=end sp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass in quick on tun0 route-to tun1 inet from 192.168.1.1 to 10.1.1.1 -[ Skip steps: a=end i=end d=end p=10 sp=end dp=10 ] +[ Skip steps: i=end d=end p=10 sp=end dp=10 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 pass in quick on tun0 route-to tun1 inet6 from fec0::/64 to fec1::2 -[ Skip steps: a=end i=end d=end sp=end ] +[ Skip steps: i=end d=end sp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in on tun0 reply-to (tun1 192.168.1.1) inet proto tcp from any to any port = ftp -[ Skip steps: a=end i=end d=end p=12 sa=12 sp=end da=12 dp=12 ] +[ Skip steps: i=end d=end p=12 sa=12 sp=end da=12 dp=12 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in on tun0 reply-to (tun1 fec0::1) inet6 proto tcp from any to any port = ftp -[ Skip steps: a=end i=end d=end sp=end ] +[ Skip steps: i=end d=end sp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 pass in quick on tun0 reply-to tun1 inet from 192.168.1.1 to 10.1.1.1 -[ Skip steps: a=end i=end d=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 pass in quick on tun0 reply-to tun1 inet6 from fec0::/64 to fec1::2 -[ Skip steps: a=end i=end d=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 pass in quick on tun0 dup-to (tun1 192.168.1.100) inet from 192.168.1.1 to 10.1.1.1 -[ Skip steps: a=end i=end d=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 pass in quick on tun0 dup-to (tun1 fec1::2) inet6 from fec0::/64 to fec1::2 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf14.loaded b/regress/sbin/pfctl/pf14.loaded index 1c21082bfc6..bf212e03a90 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 -[ Skip steps: a=end i=end d=end f=end p=end sa=3 sp=end da=2 dp=end ] +[ Skip steps: i=end d=end f=end p=end sa=3 sp=end da=2 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in quick on lo0 inet6 from fe80::1 to fe80::1 -[ Skip steps: a=end i=end d=end f=end p=end sa=3 sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sa=3 sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in quick on lo0 inet6 from fe80::1 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in quick on lo0 inet6 from any to fe80::1 -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in quick on lo0 inet6 from fe80::1 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in quick on lo0 inet6 from any to fe80::1 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index 99604ef2eb4..36c93cac3e3 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -1,56 +1,56 @@ @0 scrub in on lo0 all no-df fragment reassemble -[ Skip steps: a=end i=3 d=2 f=3 p=end sa=7 sp=end da=3 dp=end ] +[ Skip steps: i=3 d=2 f=3 p=end sa=7 sp=end da=3 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 scrub in log on lo0 all min-ttl 25 fragment reassemble -[ Skip steps: a=end i=3 f=3 p=end sa=7 sp=end da=3 dp=end ] +[ Skip steps: i=3 f=3 p=end sa=7 sp=end da=3 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 scrub on lo0 all max-mss 224 fragment reassemble -[ Skip steps: a=end p=end sa=7 sp=end dp=end ] +[ Skip steps: p=end sa=7 sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 scrub out log on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble -[ Skip steps: a=end p=end sa=7 sp=end dp=end ] +[ Skip steps: p=end sa=7 sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 scrub in on lo0 all max-mss 224 fragment reassemble -[ Skip steps: a=end i=6 d=end f=7 p=end sa=7 sp=end da=8 dp=end ] +[ Skip steps: i=6 d=end f=7 p=end sa=7 sp=end da=8 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 scrub in log on lo0 all fragment reassemble -[ Skip steps: a=end d=end f=7 p=end sa=7 sp=end da=8 dp=end ] +[ Skip steps: d=end f=7 p=end sa=7 sp=end da=8 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 scrub in log on lo1 all fragment reassemble -[ Skip steps: a=end d=end p=end sp=end da=8 dp=end ] +[ Skip steps: d=end p=end sp=end da=8 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 scrub in on lo0 inet from (lo0) to any fragment reassemble -[ Skip steps: a=end i=10 d=end p=end sp=end dp=end ] +[ Skip steps: i=10 d=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 scrub in log on lo0 inet6 from (lo1) to 2000::1 fragment reassemble -[ Skip steps: a=end i=10 d=end f=10 p=end sp=end da=10 dp=end ] +[ Skip steps: i=10 d=end f=10 p=end sp=end da=10 dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 scrub in log on lo0 inet6 from (lo0) to 2000::1 fragment reassemble -[ Skip steps: a=end d=end p=end sp=end dp=end ] +[ Skip steps: d=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble -[ Skip steps: a=end i=end d=end f=end p=end sa=12 sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sa=12 sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble -[ Skip steps: a=end i=end d=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 scrub in inet from 10.0.0.2 to 10.0.0.3 fragment reassemble -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 scrub in inet from 10.0.0.2 to 10.0.0.4 fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf16.loaded b/regress/sbin/pfctl/pf16.loaded index 95e5fed012d..5d51fe05b0c 100644 --- a/regress/sbin/pfctl/pf16.loaded +++ b/regress/sbin/pfctl/pf16.loaded @@ -1,8 +1,8 @@ @0 scrub in on lo0 all fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 pass in on lo1 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf2.loaded b/regress/sbin/pfctl/pf2.loaded index fed069365c4..dd2720f7e31 100644 --- a/regress/sbin/pfctl/pf2.loaded +++ b/regress/sbin/pfctl/pf2.loaded @@ -1,88 +1,88 @@ @0 block drop out log on tun0 all -[ Skip steps: a=end i=12 f=6 p=2 sa=6 sp=end da=7 dp=16 ] +[ Skip steps: i=12 f=6 p=2 sa=6 sp=end da=7 dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log on tun0 all -[ Skip steps: a=end i=12 f=6 sa=6 sp=end da=7 dp=16 ] +[ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst out log on tun0 proto tcp all -[ Skip steps: a=end i=12 f=6 p=4 sa=6 sp=end da=7 dp=16 ] +[ Skip steps: i=12 f=6 p=4 sa=6 sp=end da=7 dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block return-rst in log on tun0 proto tcp all -[ Skip steps: a=end i=12 f=6 sa=6 sp=end da=7 dp=16 ] +[ Skip steps: i=12 f=6 sa=6 sp=end da=7 dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-icmp(port-unr, port-unr) out log on tun0 proto udp all -[ Skip steps: a=end i=12 f=6 p=6 sa=6 sp=end da=7 dp=16 ] +[ Skip steps: i=12 f=6 p=6 sa=6 sp=end da=7 dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-icmp(port-unr, port-unr) in log on tun0 proto udp all -[ Skip steps: a=end i=12 sp=end da=7 dp=16 ] +[ Skip steps: i=12 sp=end da=7 dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop out log quick on tun0 inet from ! 157.161.48.183 to any -[ Skip steps: a=end i=12 f=12 p=13 sp=end dp=16 ] +[ Skip steps: i=12 f=12 p=13 sp=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in quick on tun0 inet from any to 255.255.255.255 -[ Skip steps: a=end i=12 d=13 f=12 p=13 sp=end dp=16 ] +[ Skip steps: i=12 d=13 f=12 p=13 sp=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in log quick on tun0 inet from 10.0.0.0/8 to any -[ Skip steps: a=end i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] +[ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in log quick on tun0 inet from 172.16.0.0/12 to any -[ Skip steps: a=end i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] +[ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in log quick on tun0 inet from 192.168.0.0/16 to any -[ Skip steps: a=end i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] +[ Skip steps: i=12 d=13 f=12 p=13 sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in log quick on tun0 inet from 255.255.255.255 to any -[ Skip steps: a=end d=13 p=13 sp=end da=end dp=16 ] +[ Skip steps: d=13 p=13 sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in log quick from no-route to any -[ Skip steps: a=end sa=end sp=end da=end dp=16 ] +[ Skip steps: sa=end sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -[ Skip steps: a=end i=end f=15 p=15 sa=end sp=end da=end dp=16 ] +[ Skip steps: i=end f=15 p=15 sa=end sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -[ Skip steps: a=end i=end sa=end sp=end da=end dp=16 ] +[ Skip steps: i=end sa=end sp=end da=end dp=16 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 pass out on tun0 proto udp all keep state -[ Skip steps: a=end i=end f=end p=17 sa=end sp=end da=end ] +[ Skip steps: i=end f=end p=17 sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 pass in on tun0 proto udp from any to any port = domain keep state -[ Skip steps: a=end i=end f=end sa=end sp=end da=end ] +[ Skip steps: i=end f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 pass out on tun0 proto tcp all keep state -[ Skip steps: a=end i=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 pass in on tun0 proto tcp from any to any port = ssh keep state -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 pass in on tun0 proto tcp from any to any port = smtp keep state -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 pass in on tun0 proto tcp from any to any port = domain keep state -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 pass in on tun0 proto tcp from any to any port = auth keep state -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf21.loaded b/regress/sbin/pfctl/pf21.loaded index 07b3a7a67c8..c4d3a60742d 100644 --- a/regress/sbin/pfctl/pf21.loaded +++ b/regress/sbin/pfctl/pf21.loaded @@ -1,16 +1,16 @@ @0 scrub in all fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 scrub in all fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 scrub in all fragment drop-ovl -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 scrub in all fragment crop -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf23.loaded b/regress/sbin/pfctl/pf23.loaded index c0423496a06..f5f0c043cc2 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: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf24.loaded b/regress/sbin/pfctl/pf24.loaded index 7e323576c8e..17b40641154 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 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in proto tcp from any to any port = ftp -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf25.loaded b/regress/sbin/pfctl/pf25.loaded index 4a42deaecf3..cf395ddc122 100644 --- a/regress/sbin/pfctl/pf25.loaded +++ b/regress/sbin/pfctl/pf25.loaded @@ -1,12 +1,12 @@ @0 block drop in on ! lo0 inet from 127.0.0.0/8 to any -[ Skip steps: a=end i=end d=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in on ! lo0 inet6 from ::1 to any -[ Skip steps: a=end i=end d=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sp=end da=end dp=end ] [ 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: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf26.loaded b/regress/sbin/pfctl/pf26.loaded index 7ba158346e7..986408efc25 100644 --- a/regress/sbin/pfctl/pf26.loaded +++ b/regress/sbin/pfctl/pf26.loaded @@ -1,8 +1,8 @@ @0 block drop in on lo0 inet from ! (lo0) to any -[ Skip steps: a=end i=end f=end p=end sp=end dp=end ] +[ Skip steps: i=end f=end p=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop out on lo0 inet from any to ! (lo0) -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf28.loaded b/regress/sbin/pfctl/pf28.loaded index 0ee3abd6254..4939e9002a7 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: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log quick on lo0 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in log-all quick on lo0 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in log quick on lo0 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in log on lo0 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in log-all on lo0 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf3.loaded b/regress/sbin/pfctl/pf3.loaded index 392eeeb5da6..37cf0eb38c5 100644 --- a/regress/sbin/pfctl/pf3.loaded +++ b/regress/sbin/pfctl/pf3.loaded @@ -1,36 +1,36 @@ @0 pass in all -[ Skip steps: a=end i=end d=end f=end p=2 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=2 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in all -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in proto tcp all flags FPUEW/FSRPAUEW -[ Skip steps: a=end i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in proto tcp all flags FS/FSRA -[ Skip steps: a=end i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in proto tcp all flags /FSRAW -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in proto udp all -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in proto icmp all -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 pass in proto tcp all flags S/SA -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass in all flags S/SA -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf30.loaded b/regress/sbin/pfctl/pf30.loaded index add17ea201a..b5d1810145d 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: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf31.loaded b/regress/sbin/pfctl/pf31.loaded index 5d30af1fdf8..67e51d364cc 100644 --- a/regress/sbin/pfctl/pf31.loaded +++ b/regress/sbin/pfctl/pf31.loaded @@ -1,36 +1,36 @@ @0 block return in on lo0 all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block return in on lo0 inet all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return in on lo0 inet6 all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in on lo0 all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in on lo0 inet all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in on lo0 inet6 all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block return in on lo0 all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block return in on lo0 inet all -[ Skip steps: a=end i=end d=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block return in on lo0 inet6 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf32.loaded b/regress/sbin/pfctl/pf32.loaded index 82f3b0b3446..8753173e811 100644 --- a/regress/sbin/pfctl/pf32.loaded +++ b/regress/sbin/pfctl/pf32.loaded @@ -1,28 +1,28 @@ @0 pass in inet from 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in inet from 10.1.0.0/16 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in inet from 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in inet from 192.168.37.0/25 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in inet from 192.168.37.0/24 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in inet from 192.168.0.0/16 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in inet from 192.0.0.0/8 to any -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf33.loaded b/regress/sbin/pfctl/pf33.loaded index 524476d5103..b46e8ba7164 100644 --- a/regress/sbin/pfctl/pf33.loaded +++ b/regress/sbin/pfctl/pf33.loaded @@ -1,24 +1,24 @@ @0 block return in on lo0 inet all queue rsets -[ Skip steps: a=end i=end d=2 f=end sa=end sp=end da=end ] +[ Skip steps: i=end d=2 f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in on lo0 inet proto tcp from any to any port = www keep state queue http -[ Skip steps: a=end i=end f=end p=5 sa=end sp=end da=end ] +[ Skip steps: i=end f=end p=5 sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass out on lo0 inet proto tcp from any to any port = ssh keep state queue ssh -[ Skip steps: a=end i=end f=end p=5 sa=end sp=end da=end dp=4 ] +[ Skip steps: i=end f=end p=5 sa=end sp=end da=end dp=4 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in on lo0 inet proto tcp from any to any port = ssh keep state queue ssh -[ Skip steps: a=end i=end f=end p=5 sa=end sp=end da=end ] +[ Skip steps: i=end f=end p=5 sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass out on lo0 inet proto tcp from any to any port = smtp keep state queue mail -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass out on lo0 inet all keep state -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf34.loaded b/regress/sbin/pfctl/pf34.loaded index 304052b12e0..d6f7d863ba8 100644 --- a/regress/sbin/pfctl/pf34.loaded +++ b/regress/sbin/pfctl/pf34.loaded @@ -1,8 +1,8 @@ @0 pass in inet from any to 127.0.0.1 -[ Skip steps: a=end i=end d=end p=end sa=end sp=end dp=end ] +[ Skip steps: i=end d=end p=end sa=end sp=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in inet6 from any to 2000::1 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf35.loaded b/regress/sbin/pfctl/pf35.loaded index 098c2f6eb9e..ad524701b86 100644 --- a/regress/sbin/pfctl/pf35.loaded +++ b/regress/sbin/pfctl/pf35.loaded @@ -1,24 +1,24 @@ @0 block return out on lo0 inet all queue std -[ Skip steps: a=end i=end d=end f=end sp=end da=end ] +[ Skip steps: i=end d=end f=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass out on lo0 inet proto tcp from 10.0.0.0/24 to any port = www keep state queue developers -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=3 ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=3 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass out on lo0 inet proto tcp from 10.0.1.0/24 to any port = www keep state queue employees -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass out on lo0 inet proto tcp from any to any port = ssh tos 0x10 keep state queue ssh_interactive -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end dp=5 ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=5 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass out on lo0 inet proto tcp from any to any port = ssh tos 0x08 keep state queue ssh_bulk -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass out on lo0 inet proto tcp from any to any port = smtp keep state queue mail -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf38.loaded b/regress/sbin/pfctl/pf38.loaded index 0e6aa128180..5b6cd1e63ae 100644 --- a/regress/sbin/pfctl/pf38.loaded +++ b/regress/sbin/pfctl/pf38.loaded @@ -1,16 +1,16 @@ @0 pass in on tun0 proto tcp all user = 3 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in on tun0 proto tcp all group = 7 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in on tun0 proto tcp all user = 3 group = 0 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in on tun0 proto tcp all user = 0 group = 0 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf39.loaded b/regress/sbin/pfctl/pf39.loaded index aab925916e3..7522b8a56a2 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: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ 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: a=end i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] [ 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: a=end i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] [ 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: a=end i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=5 sa=end sp=end da=end dp=end ] [ 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: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass in log quick on lo0 inet proto tcp all keep state -[ Skip steps: a=end i=end d=end f=end p=7 sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=7 sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state label blah queue blah -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ 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 -[ Skip steps: a=end i=end d=end f=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf4.loaded b/regress/sbin/pfctl/pf4.loaded index 894e5c43e1f..386a3a9c905 100644 --- a/regress/sbin/pfctl/pf4.loaded +++ b/regress/sbin/pfctl/pf4.loaded @@ -1,184 +1,184 @@ @0 block drop in all -[ Skip steps: a=end i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in proto tcp all -[ Skip steps: a=end i=end d=end f=5 p=3 sa=5 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=5 p=3 sa=5 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block drop in proto tcp all -[ Skip steps: a=end i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block drop in proto udp all -[ Skip steps: a=end i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=5 sa=5 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block drop in all -[ Skip steps: a=end i=end d=end p=9 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end p=9 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block drop in inet from 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=end f=9 p=9 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop in inet from ! 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=end f=9 p=9 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in inet from 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=end f=9 p=9 sp=9 da=14 dp=14 ] +[ Skip steps: i=end d=end f=9 p=9 sp=9 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in inet from 172.16.0.0/12 to any -[ Skip steps: a=end i=end d=end da=14 dp=14 ] +[ Skip steps: i=end d=end da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in proto tcp from any port = ssh to any -[ Skip steps: a=end i=end d=end f=14 p=30 sa=14 sp=11 da=14 dp=14 ] +[ Skip steps: i=end d=end f=14 p=30 sa=14 sp=11 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in proto tcp from any port = ssh to any -[ Skip steps: a=end i=end d=end f=14 p=30 sa=14 da=14 dp=14 ] +[ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in proto tcp from any port 21 >< 2048 to any -[ Skip steps: a=end i=end d=end f=14 p=30 sa=14 da=14 dp=14 ] +[ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop in proto tcp from any port != 1234 to any -[ Skip steps: a=end i=end d=end f=14 p=30 sa=14 da=14 dp=14 ] +[ Skip steps: i=end d=end f=14 p=30 sa=14 da=14 dp=14 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 block drop in proto tcp from any port >= 80 to any -[ Skip steps: a=end i=end d=end p=30 ] +[ Skip steps: i=end d=end p=30 ] [ 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: a=end i=end d=end f=end p=30 sa=22 sp=18 da=16 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 da=16 ] [ 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: a=end i=end d=end f=end p=30 sa=22 sp=18 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 block drop in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=22 sp=18 da=18 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 sp=18 da=18 ] [ 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 = 6668 -[ Skip steps: a=end i=end d=end f=end p=30 sa=22 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=22 sp=22 da=20 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 da=20 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=30 sa=22 sp=22 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=22 sp=22 da=22 ] +[ Skip steps: i=end d=end f=end p=30 sa=22 sp=22 da=22 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 block drop in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=30 ] +[ Skip steps: i=end d=end f=end p=30 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @22 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 sp=26 da=24 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 da=24 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @23 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 sp=26 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 sp=26 da=26 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 sp=26 da=26 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @25 block drop in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 sp=30 da=28 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 da=28 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @27 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 sp=30 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @28 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=30 sa=30 sp=30 da=30 ] +[ Skip steps: i=end d=end f=end p=30 sa=30 sp=30 da=30 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @29 block drop in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=end f=end ] +[ Skip steps: i=end d=end f=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @30 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 sp=34 da=32 ] +[ Skip steps: i=end d=end f=end p=end sa=38 sp=34 da=32 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @31 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 sp=34 ] +[ Skip steps: i=end d=end f=end p=end sa=38 sp=34 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @32 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 sp=34 da=34 ] +[ Skip steps: i=end d=end f=end p=end sa=38 sp=34 da=34 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @33 block drop in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 ] +[ Skip steps: i=end d=end f=end p=end sa=38 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @34 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 sp=38 da=36 ] +[ Skip steps: i=end d=end f=end p=end sa=38 sp=38 da=36 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @35 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 sp=38 ] +[ Skip steps: i=end d=end f=end p=end sa=38 sp=38 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @36 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=38 sp=38 da=38 ] +[ Skip steps: i=end d=end f=end p=end sa=38 sp=38 da=38 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @37 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end ] +[ Skip steps: i=end d=end f=end p=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @38 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=42 da=40 ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=42 da=40 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @39 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=42 ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=42 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @40 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=42 da=42 ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=42 da=42 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @41 block drop in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end sa=end ] +[ Skip steps: i=end d=end f=end p=end sa=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @42 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=44 ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=44 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @43 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @44 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @45 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf40.loaded b/regress/sbin/pfctl/pf40.loaded index 8c5ed94cb4d..5f43a1603e3 100644 --- a/regress/sbin/pfctl/pf40.loaded +++ b/regress/sbin/pfctl/pf40.loaded @@ -1,104 +1,104 @@ @0 scrub all fragment reassemble -[ Skip steps: a=end i=end d=2 f=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end d=2 f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 scrub all fragment reassemble -[ Skip steps: a=end i=end f=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 scrub in all fragment reassemble -[ Skip steps: a=end i=end f=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 scrub out all fragment reassemble -[ Skip steps: a=end i=end f=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 scrub in all fragment reassemble -[ Skip steps: a=end i=end f=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: i=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 scrub all fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @0 block drop all -[ Skip steps: a=end i=12 d=4 f=end p=2 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 d=4 f=end p=2 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block return all -[ Skip steps: a=end i=12 d=4 f=end sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 d=4 f=end sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst proto tcp all -[ Skip steps: a=end i=12 d=4 f=end sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 d=4 f=end sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 pass out all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 pass all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop out all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 pass in all -[ Skip steps: a=end i=12 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 pass out all -[ Skip steps: a=end f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 block drop on lo0 all -[ Skip steps: a=end i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 pass on lo0 all -[ Skip steps: a=end i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=15 d=17 f=end p=15 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 block drop on lo0 all -[ Skip steps: a=end d=17 f=end sa=end sp=end da=end dp=19 ] +[ Skip steps: d=17 f=end sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 pass proto tcp all flags S/SA -[ Skip steps: a=end i=19 d=17 f=end sa=end sp=end da=end dp=19 ] +[ Skip steps: i=19 d=17 f=end sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 pass proto udp all keep state -[ Skip steps: a=end i=19 f=end p=19 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=19 f=end p=19 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 pass in proto udp all keep state -[ Skip steps: a=end i=19 f=end p=19 sa=end sp=end da=end dp=19 ] +[ Skip steps: i=19 f=end p=19 sa=end sp=end da=end dp=19 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 pass out proto udp all keep state -[ Skip steps: a=end d=end f=end sa=end sp=end da=end ] +[ Skip steps: d=end f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 pass out on lo0 proto tcp from any to any port = smtp keep state -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf43.loaded b/regress/sbin/pfctl/pf43.loaded index c89f0f108df..c971e64a437 100644 --- a/regress/sbin/pfctl/pf43.loaded +++ b/regress/sbin/pfctl/pf43.loaded @@ -1,20 +1,20 @@ @0 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue bulk -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 pass in on lo0 inet proto tcp from any to 127.0.0.1 port = ssh queue(bulk, prio) -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf44.loaded b/regress/sbin/pfctl/pf44.loaded index 6f235e3d9d6..8b69ba598fb 100644 --- a/regress/sbin/pfctl/pf44.loaded +++ b/regress/sbin/pfctl/pf44.loaded @@ -1,24 +1,24 @@ @0 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment drop-ovl -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment crop -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 scrub in on lo0 all no-df min-ttl 15 max-mss 224 fragment reassemble -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf5.loaded b/regress/sbin/pfctl/pf5.loaded index efbaae5e990..bf7828eabb1 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: a=end i=end d=end f=end p=end sa=end sp=2 da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=2 da=end ] [ 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: a=end i=end d=end f=end p=end sa=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end da=end ] [ 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: a=end i=end d=end f=end p=end sa=end sp=4 da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=4 da=end ] [ 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: a=end i=end d=end f=end p=end sa=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end da=end ] [ 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: a=end i=end d=end f=end p=end sa=end sp=6 da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=6 da=end ] [ 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: a=end i=end d=end f=end p=end sa=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end da=end ] [ 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: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ 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: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf7.loaded b/regress/sbin/pfctl/pf7.loaded index 086b4134535..2116c508bcb 100644 --- a/regress/sbin/pfctl/pf7.loaded +++ b/regress/sbin/pfctl/pf7.loaded @@ -1,84 +1,84 @@ @0 block drop out log on tun0 all -[ Skip steps: a=end i=end f=6 p=2 sa=6 sp=end da=7 dp=15 ] +[ Skip steps: i=end f=6 p=2 sa=6 sp=end da=7 dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in log on tun0 all -[ Skip steps: a=end i=end f=6 sa=6 sp=end da=7 dp=15 ] +[ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 block return-rst out log on tun0 proto tcp all -[ Skip steps: a=end i=end f=6 p=4 sa=6 sp=end da=7 dp=15 ] +[ Skip steps: i=end f=6 p=4 sa=6 sp=end da=7 dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @3 block return-rst in log on tun0 proto tcp all -[ Skip steps: a=end i=end f=6 sa=6 sp=end da=7 dp=15 ] +[ Skip steps: i=end f=6 sa=6 sp=end da=7 dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 block return-icmp(port-unr, port-unr) out log on tun0 proto udp all -[ Skip steps: a=end i=end f=6 p=6 sa=6 sp=end da=7 dp=15 ] +[ Skip steps: i=end f=6 p=6 sa=6 sp=end da=7 dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @5 block return-icmp(port-unr, port-unr) in log on tun0 proto udp all -[ Skip steps: a=end i=end sp=end da=7 dp=15 ] +[ Skip steps: i=end sp=end da=7 dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @6 block drop out log quick on tun0 inet from ! 157.161.48.183 to any -[ Skip steps: a=end i=end f=14 p=12 sp=end dp=15 ] +[ Skip steps: i=end f=14 p=12 sp=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @7 block drop in quick on tun0 inet from any to 255.255.255.255 -[ Skip steps: a=end i=end d=12 f=14 p=12 sp=end dp=15 ] +[ Skip steps: i=end d=12 f=14 p=12 sp=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @8 block drop in log quick on tun0 inet from 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=12 f=14 p=12 sp=end da=end dp=15 ] +[ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @9 block drop in log quick on tun0 inet from 172.16.0.0/12 to any -[ Skip steps: a=end i=end d=12 f=14 p=12 sp=end da=end dp=15 ] +[ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @10 block drop in log quick on tun0 inet from 192.168.0.0/16 to any -[ Skip steps: a=end i=end d=12 f=14 p=12 sp=end da=end dp=15 ] +[ Skip steps: i=end d=12 f=14 p=12 sp=end da=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @11 block drop in log quick on tun0 inet from 255.255.255.255 to any -[ Skip steps: a=end i=end f=14 sp=end da=end dp=15 ] +[ Skip steps: i=end f=14 sp=end da=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @12 pass out on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -[ Skip steps: a=end i=end f=14 p=14 sa=end sp=end da=end dp=15 ] +[ Skip steps: i=end f=14 p=14 sa=end sp=end da=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @13 pass in on tun0 inet proto icmp all icmp-type echoreq code 0 keep state -[ Skip steps: a=end i=end sa=end sp=end da=end dp=15 ] +[ Skip steps: i=end sa=end sp=end da=end dp=15 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @14 pass out on tun0 proto udp all keep state -[ Skip steps: a=end i=end f=end p=16 sa=end sp=end da=end ] +[ Skip steps: i=end f=end p=16 sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @15 pass in on tun0 proto udp from any to any port = domain keep state -[ Skip steps: a=end i=end f=end sa=end sp=end da=end ] +[ Skip steps: i=end f=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 pass out on tun0 proto tcp all modulate state -[ Skip steps: a=end i=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @17 pass in on tun0 proto tcp from any to any port = ssh modulate state -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @18 pass in on tun0 proto tcp from any to any port = smtp modulate state -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @19 pass in on tun0 proto tcp from any to any port = domain modulate state -[ Skip steps: a=end i=end d=end f=end p=end sa=end sp=end da=end ] +[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @20 pass in on tun0 proto tcp from any to any port = auth modulate state -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf8.loaded b/regress/sbin/pfctl/pf8.loaded index 8414a223a8a..fb421091147 100644 --- a/regress/sbin/pfctl/pf8.loaded +++ b/regress/sbin/pfctl/pf8.loaded @@ -1,8 +1,8 @@ @0 block drop out log on tun1 inet from ! 10.0.0.0/8 to any -[ Skip steps: a=end i=end d=end f=end p=end sp=end da=end dp=end ] +[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop out log on tun1 inet from 10.1.2.3 to any -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf9.loaded b/regress/sbin/pfctl/pf9.loaded index 3c46cdfd596..74c0caa8828 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: a=end d=end f=end p=end sa=end sp=end da=end dp=end ] +[ Skip steps: d=end f=end p=end sa=end sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 block drop in on tun0 all -[ Skip steps: a=end i=end d=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 sp=end da=end dp=end ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ce00dae0801..05172a98dcb 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.115 2003/01/01 00:58:10 dhartmei Exp $ */ +/* $OpenBSD: pfctl.c,v 1.116 2003/01/01 04:26:19 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -461,7 +461,7 @@ void pfctl_print_rule_counters(struct pf_rule *rule, int opts) { if (opts & PF_OPT_VERBOSE2) { - const char *t[PF_SKIP_COUNT] = { "a", "i", "d", "f", + const char *t[PF_SKIP_COUNT] = { "i", "d", "f", "p", "sa", "sp", "da", "dp" }; int i; diff --git a/sys/net/pf.c b/sys/net/pf.c index 9951290280b..c71f3b73e42 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.291 2003/01/01 03:53:22 dhartmei Exp $ */ +/* $OpenBSD: pf.c,v 1.292 2003/01/01 04:26:19 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -725,9 +725,6 @@ pf_calc_skip_steps(struct pf_rulequeue *rules) head[i] = cur; while (cur != NULL) { - if ((cur->action == PF_SCRUB && prev->action != PF_SCRUB) || - (cur->action != PF_SCRUB && prev->action == PF_SCRUB)) - PF_SET_SKIP_STEPS(PF_SKIP_ACTION); if (cur->ifp != prev->ifp || cur->ifnot != prev->ifnot) PF_SET_SKIP_STEPS(PF_SKIP_IFP); if (cur->direction != prev->direction) @@ -1809,9 +1806,7 @@ pf_test_tcp(struct pf_rule **rm, int direction, struct ifnet *ifp, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action == PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || + if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || (r->ifp == ifp && r->ifnot))) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != direction) @@ -2064,9 +2059,7 @@ pf_test_udp(struct pf_rule **rm, int direction, struct ifnet *ifp, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action == PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || + if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || (r->ifp == ifp && r->ifnot))) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != direction) @@ -2345,9 +2338,7 @@ pf_test_icmp(struct pf_rule **rm, int direction, struct ifnet *ifp, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action == PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || + if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || (r->ifp == ifp && r->ifnot))) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != direction) @@ -2550,9 +2541,7 @@ pf_test_other(struct pf_rule **rm, int direction, struct ifnet *ifp, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action == PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || + if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || (r->ifp == ifp && r->ifnot))) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != direction) @@ -2697,9 +2686,7 @@ pf_test_fragment(struct pf_rule **rm, int direction, struct ifnet *ifp, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action == PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || + if (r->ifp != NULL && ((r->ifp != ifp && !r->ifnot) || (r->ifp == ifp && r->ifnot))) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != direction) diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index 3814aa6d5f2..a118b464e4a 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.44 2002/12/31 19:18:41 mcbride Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.45 2003/01/01 04:26:19 dhartmei Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -803,9 +803,7 @@ pf_normalize_ip(struct mbuf **m0, int dir, struct ifnet *ifp, u_short *reason) r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action != PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && r->ifp != ifp) + if (r->ifp != NULL && r->ifp != ifp) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != dir) r = r->skip[PF_SKIP_DIR].ptr; @@ -1008,9 +1006,7 @@ pf_normalize_tcp(int dir, struct ifnet *ifp, struct mbuf *m, int ipoff, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); while (r != NULL) { r->evaluations++; - if (r->action != PF_SCRUB) - r = r->skip[PF_SKIP_ACTION].ptr; - else if (r->ifp != NULL && r->ifp != ifp) + if (r->ifp != NULL && r->ifp != ifp) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != dir) r = r->skip[PF_SKIP_DIR].ptr; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 652ec2731b2..a71047eed17 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.120 2002/12/31 19:18:41 mcbride Exp $ */ +/* $OpenBSD: pfvar.h,v 1.121 2003/01/01 04:26:19 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -282,16 +282,15 @@ struct pf_pool { struct pf_rule { struct pf_rule_addr src; struct pf_rule_addr dst; -#define PF_SKIP_ACTION 0 -#define PF_SKIP_IFP 1 -#define PF_SKIP_DIR 2 -#define PF_SKIP_AF 3 -#define PF_SKIP_PROTO 4 -#define PF_SKIP_SRC_ADDR 5 -#define PF_SKIP_SRC_PORT 6 -#define PF_SKIP_DST_ADDR 7 -#define PF_SKIP_DST_PORT 8 -#define PF_SKIP_COUNT 9 +#define PF_SKIP_IFP 0 +#define PF_SKIP_DIR 1 +#define PF_SKIP_AF 2 +#define PF_SKIP_PROTO 3 +#define PF_SKIP_SRC_ADDR 4 +#define PF_SKIP_SRC_PORT 5 +#define PF_SKIP_DST_ADDR 6 +#define PF_SKIP_DST_PORT 7 +#define PF_SKIP_COUNT 8 union { struct pf_rule *ptr; u_int32_t nr; |