diff options
author | Aaron Campbell <aaron@cvs.openbsd.org> | 2004-09-21 16:59:50 +0000 |
---|---|---|
committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2004-09-21 16:59:50 +0000 |
commit | c9e55bb99549e8c5c150ac3c6a2a8ca2ef8e4906 (patch) | |
tree | f3c7107e69af046748085629922d6d8b51fb5a2d /regress/sbin | |
parent | 1b1b7e0ae965714670e0dda240c73d1e215242ce (diff) |
Basic tests for new "no scrub" functionality.
Diffstat (limited to 'regress/sbin')
-rw-r--r-- | regress/sbin/pfctl/pf15.in | 1 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf15.loaded | 98 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf15.ok | 1 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf68.in | 1 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf68.loaded | 258 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf68.ok | 1 |
6 files changed, 186 insertions, 174 deletions
diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in index 945b8b518c8..dedb52bb00d 100644 --- a/regress/sbin/pfctl/pf15.in +++ b/regress/sbin/pfctl/pf15.in @@ -1,3 +1,4 @@ +no scrub on lo0 from 192.168.1.1 to 10.1.2.3 scrub in on lo0 from any to any no-df scrub in log on lo0 from any to any min-ttl 25 scrub on lo0 from any to any max-mss 224 diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index 73c0e874ab1..d195ad407e3 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -1,104 +1,108 @@ -@0 scrub in on lo0 all no-df fragment reassemble - [ Skip steps: i=3 d=2 f=3 p=end sa=7 sp=end da=3 dp=end ] +@0 no scrub on lo0 inet from 192.168.1.1 to 10.1.2.3 + [ Skip steps: i=4 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@1 scrub in log on lo0 all min-ttl 25 fragment reassemble - [ Skip steps: i=3 f=3 p=end sa=7 sp=end da=3 dp=end ] +@1 scrub in on lo0 all no-df fragment reassemble + [ Skip steps: i=4 d=3 f=4 p=end sa=8 sp=end da=4 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@2 scrub on lo0 all max-mss 224 fragment reassemble - [ Skip steps: p=end sa=7 sp=end dp=end ] +@2 scrub in log on lo0 all min-ttl 25 fragment reassemble + [ Skip steps: i=4 f=4 p=end sa=8 sp=end da=4 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 scrub out log on lo1000000 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble - [ Skip steps: p=end sa=7 sp=end dp=end ] +@3 scrub on lo0 all max-mss 224 fragment reassemble + [ Skip steps: p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@4 scrub in on lo0 all max-mss 224 fragment reassemble - [ Skip steps: i=6 d=end f=7 p=end sa=7 sp=end da=8 dp=end ] +@4 scrub out log on lo1000000 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble + [ Skip steps: p=end sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 scrub in log on lo0 all fragment reassemble - [ Skip steps: d=end f=7 p=end sa=7 sp=end da=8 dp=end ] +@5 scrub in on lo0 all max-mss 224 fragment reassemble + [ Skip steps: i=7 d=end f=8 p=end sa=8 sp=end da=9 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 scrub in log on lo1000000 all fragment reassemble - [ Skip steps: d=end p=end sp=end da=8 dp=end ] +@6 scrub in log on lo0 all fragment reassemble + [ Skip steps: d=end f=8 p=end sa=8 sp=end da=9 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 scrub in on lo0 inet from (lo0:1) to any fragment reassemble - [ Skip steps: i=10 d=end p=end sp=end dp=end ] +@7 scrub in log on lo1000000 all fragment reassemble + [ Skip steps: d=end p=end sp=end da=9 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 scrub in log on lo0 inet6 from (lo1000000:*) to 2000::1 fragment reassemble - [ Skip steps: i=10 d=end f=10 p=end sp=end da=10 dp=end ] +@8 scrub in on lo0 inet from (lo0:1) to any fragment reassemble + [ Skip steps: i=11 d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 scrub in log on lo0 inet6 from (lo0:2) to 2000::1 fragment reassemble +@9 scrub in log on lo0 inet6 from (lo1000000:*) to 2000::1 fragment reassemble + [ Skip steps: i=11 d=end f=11 p=end sp=end da=11 dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@10 scrub in log on lo0 inet6 from (lo0:2) to 2000::1 fragment reassemble [ Skip steps: d=end p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble - [ Skip steps: i=16 d=end f=15 p=end sa=12 sp=end dp=end ] +@11 scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble + [ Skip steps: i=17 d=end f=16 p=end sa=13 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ 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: i=16 d=end f=15 p=end sp=end dp=end ] +@12 scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble + [ Skip steps: i=17 d=end f=16 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ 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: i=16 d=end f=15 p=end sa=14 sp=end dp=end ] +@13 scrub in inet from 10.0.0.2 to 10.0.0.3 fragment reassemble + [ Skip steps: i=17 d=end f=16 p=end sa=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ 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: i=16 d=end f=15 p=end sp=end dp=end ] +@14 scrub in inet from 10.0.0.2 to 10.0.0.4 fragment reassemble + [ Skip steps: i=17 d=end f=16 p=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 scrub in inet from 127.0.0.1 to any fragment reassemble - [ Skip steps: i=16 d=end p=end sp=end da=end dp=end ] +@15 scrub in inet from 127.0.0.1 to any fragment reassemble + [ Skip steps: i=17 d=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 scrub in inet6 from ::1 to any fragment reassemble - [ Skip steps: d=end f=17 p=end sp=end da=end dp=end ] +@16 scrub in inet6 from ::1 to any fragment reassemble + [ Skip steps: d=end f=18 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble +@17 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble [ Skip steps: d=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 scrub in inet from 10.1.1.1 to any fragment reassemble - [ Skip steps: i=21 d=end f=20 p=end sp=end da=end dp=end ] +@18 scrub in inet from 10.1.1.1 to any fragment reassemble + [ Skip steps: i=22 d=end f=21 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 scrub in inet from 10.0.0.1 to any fragment reassemble - [ Skip steps: i=21 d=end f=20 p=end sp=end da=end dp=end ] +@19 scrub in inet from 10.0.0.1 to any fragment reassemble + [ Skip steps: i=22 d=end f=21 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 scrub in inet from 127.0.0.1 to any fragment reassemble - [ Skip steps: i=21 d=end p=end sp=end da=end dp=end ] +@20 scrub in inet from 127.0.0.1 to any fragment reassemble + [ Skip steps: i=22 d=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 scrub in inet6 from ::1 to any fragment reassemble - [ Skip steps: d=end f=22 p=end sp=end da=end dp=end ] +@21 scrub in inet6 from ::1 to any fragment reassemble + [ Skip steps: d=end f=23 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble +@22 scrub in on lo0 inet6 from fe80::1 to any fragment reassemble [ Skip steps: d=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 scrub in inet from ! 127.0.0.1 to any fragment reassemble - [ Skip steps: i=24 d=end p=end sp=end da=end dp=end ] +@23 scrub in inet from ! 127.0.0.1 to any fragment reassemble + [ Skip steps: i=25 d=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 scrub in inet6 from ! ::1 to any fragment reassemble - [ Skip steps: d=end f=25 p=end sp=end da=end dp=end ] +@24 scrub in inet6 from ! ::1 to any fragment reassemble + [ Skip steps: d=end f=26 p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble +@25 scrub in on lo0 inet6 from ! fe80::1 to any fragment reassemble [ Skip steps: d=end p=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@25 scrub in on ! lo0 all fragment reassemble +@26 scrub in on ! lo0 all fragment reassemble [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf15.ok b/regress/sbin/pfctl/pf15.ok index c98b8db4810..838e5c4e03a 100644 --- a/regress/sbin/pfctl/pf15.ok +++ b/regress/sbin/pfctl/pf15.ok @@ -1,3 +1,4 @@ +no scrub on lo0 inet from 192.168.1.1 to 10.1.2.3 scrub in on lo0 all no-df fragment reassemble scrub in log on lo0 all min-ttl 25 fragment reassemble scrub on lo0 all max-mss 224 fragment reassemble diff --git a/regress/sbin/pfctl/pf68.in b/regress/sbin/pfctl/pf68.in index 273a91cb917..8b440b4264d 100644 --- a/regress/sbin/pfctl/pf68.in +++ b/regress/sbin/pfctl/pf68.in @@ -1,3 +1,4 @@ +no scrub on lo0 inet proto tcp from 192.168.1.1 port 1024 to any port 80 scrub proto tcp scrub proto tcp all scrub proto tcp from any to any diff --git a/regress/sbin/pfctl/pf68.loaded b/regress/sbin/pfctl/pf68.loaded index 5aafdf8807c..72ca67830d8 100644 --- a/regress/sbin/pfctl/pf68.loaded +++ b/regress/sbin/pfctl/pf68.loaded @@ -1,264 +1,268 @@ -@0 scrub proto tcp all fragment reassemble - [ Skip steps: i=14 d=3 f=10 p=end sa=8 sp=43 da=10 dp=35 ] +@0 no scrub on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = www + [ Skip steps: d=4 p=end da=11 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @1 scrub proto tcp all fragment reassemble - [ Skip steps: i=14 d=3 f=10 p=end sa=8 sp=43 da=10 dp=35 ] + [ Skip steps: i=15 d=4 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @2 scrub proto tcp all fragment reassemble - [ Skip steps: i=14 f=10 p=end sa=8 sp=43 da=10 dp=35 ] + [ Skip steps: i=15 d=4 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@3 scrub in proto tcp all fragment reassemble - [ Skip steps: i=14 d=29 f=10 p=end sa=8 sp=43 da=10 dp=35 ] +@3 scrub proto tcp all fragment reassemble + [ Skip steps: i=15 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @4 scrub in proto tcp all fragment reassemble - [ Skip steps: i=14 d=29 f=10 p=end sa=8 sp=43 da=10 dp=35 ] + [ Skip steps: i=15 d=30 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@5 scrub in proto tcp all fragment crop - [ Skip steps: i=14 d=29 f=10 p=end sa=8 sp=43 da=10 dp=35 ] +@5 scrub in proto tcp all fragment reassemble + [ Skip steps: i=15 d=30 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@6 scrub in proto tcp all fragment drop-ovl - [ Skip steps: i=14 d=29 f=10 p=end sa=8 sp=43 da=10 dp=35 ] +@6 scrub in proto tcp all fragment crop + [ Skip steps: i=15 d=30 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@7 scrub in proto tcp all fragment reassemble - [ Skip steps: i=14 d=29 f=10 p=end sp=43 da=10 dp=35 ] +@7 scrub in proto tcp all fragment drop-ovl + [ Skip steps: i=15 d=30 f=11 p=end sa=9 sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@8 scrub in proto tcp from <regress.1:*> to any fragment reassemble - [ Skip steps: i=14 d=29 f=10 p=end sp=43 da=10 dp=35 ] +@8 scrub in proto tcp all fragment reassemble + [ Skip steps: i=15 d=30 f=11 p=end sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@9 scrub in proto tcp from ! <regress.2:*> to any fragment reassemble - [ Skip steps: i=14 d=29 p=end sp=43 dp=35 ] +@9 scrub in proto tcp from <regress.1:*> to any fragment reassemble + [ Skip steps: i=15 d=30 f=11 p=end sp=44 da=11 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@10 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.3 fragment reassemble - [ Skip steps: i=14 d=29 f=14 p=end sa=12 sp=43 dp=35 ] +@10 scrub in proto tcp from ! <regress.2:*> to any fragment reassemble + [ Skip steps: i=15 d=30 p=end sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@11 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.4 fragment reassemble - [ Skip steps: i=14 d=29 f=14 p=end sp=43 dp=35 ] +@11 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.3 fragment reassemble + [ Skip steps: i=15 d=30 f=15 p=end sa=13 sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@12 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.3 fragment reassemble - [ Skip steps: i=14 d=29 f=14 p=end sa=14 sp=43 dp=35 ] +@12 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.4 fragment reassemble + [ Skip steps: i=15 d=30 f=15 p=end sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@13 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.4 fragment reassemble - [ Skip steps: d=29 p=end sp=43 dp=35 ] +@13 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.3 fragment reassemble + [ Skip steps: i=15 d=30 f=15 p=end sa=15 sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@14 scrub in log on lo0 proto tcp all min-ttl 25 fragment reassemble - [ Skip steps: i=18 d=29 p=end sp=43 dp=35 ] +@14 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.4 fragment reassemble + [ Skip steps: d=30 p=end sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@15 scrub in log on lo0 inet6 proto tcp from (lo1000000:*) to 2000::1 fragment reassemble - [ Skip steps: i=18 d=29 f=17 p=end sp=43 da=17 dp=35 ] +@15 scrub in log on lo0 proto tcp all min-ttl 25 fragment reassemble + [ Skip steps: i=19 d=30 p=end sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@16 scrub in log on lo0 inet6 proto tcp from (lo0:2) to 2000::1 fragment reassemble - [ Skip steps: i=18 d=29 p=end sp=43 dp=35 ] +@16 scrub in log on lo0 inet6 proto tcp from (lo1000000:*) to 2000::1 fragment reassemble + [ Skip steps: i=19 d=30 f=18 p=end sp=44 da=18 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@17 scrub in log on lo0 proto tcp all fragment reassemble - [ Skip steps: d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@17 scrub in log on lo0 inet6 proto tcp from (lo0:2) to 2000::1 fragment reassemble + [ Skip steps: i=19 d=30 p=end sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@18 scrub in log on lo1000000 proto tcp all fragment reassemble - [ Skip steps: d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@18 scrub in log on lo0 proto tcp all fragment reassemble + [ Skip steps: d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@19 scrub in on lo0 proto tcp all fragment reassemble - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@19 scrub in log on lo1000000 proto tcp all fragment reassemble + [ Skip steps: d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@20 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@20 scrub in on lo0 proto tcp all fragment reassemble + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@21 scrub in on lo0 proto tcp all max-mss 224 fragment reassemble - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@21 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@22 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@22 scrub in on lo0 proto tcp all max-mss 224 fragment reassemble + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@23 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment drop-ovl - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@23 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@24 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@24 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment drop-ovl + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@25 scrub in on lo0 proto tcp all no-df fragment reassemble - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@25 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@26 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment crop - [ Skip steps: i=30 d=29 f=28 p=end sa=28 sp=43 da=31 dp=35 ] +@26 scrub in on lo0 proto tcp all no-df fragment reassemble + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@27 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=30 d=29 p=end sp=43 da=31 dp=35 ] +@27 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment crop + [ Skip steps: i=31 d=30 f=29 p=end sa=29 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@28 scrub in on lo0 inet proto tcp from (lo0:1) to any fragment reassemble - [ Skip steps: i=30 p=end sp=43 da=31 dp=35 ] +@28 scrub in on lo0 proto tcp all no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=31 d=30 p=end sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@29 scrub on lo0 proto tcp all max-mss 224 fragment reassemble - [ Skip steps: f=33 p=end sa=36 sp=43 da=31 dp=35 ] +@29 scrub in on lo0 inet proto tcp from (lo0:1) to any fragment reassemble + [ Skip steps: i=31 p=end sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@30 scrub out proto tcp all fragment reassemble - [ Skip steps: i=33 d=34 f=33 p=end sa=36 sp=43 dp=35 ] +@30 scrub on lo0 proto tcp all max-mss 224 fragment reassemble + [ Skip steps: f=34 p=end sa=37 sp=44 da=32 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@31 scrub out proto tcp from any to ! <regress.1:*> fragment reassemble - [ Skip steps: i=33 d=34 f=33 p=end sa=36 sp=43 dp=35 ] +@31 scrub out proto tcp all fragment reassemble + [ Skip steps: i=34 d=35 f=34 p=end sa=37 sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@32 scrub out proto tcp from any to <regress.2:*> fragment reassemble - [ Skip steps: d=34 p=end sa=36 sp=43 dp=35 ] +@32 scrub out proto tcp from any to ! <regress.1:*> fragment reassemble + [ Skip steps: i=34 d=35 f=34 p=end sa=37 sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@33 scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 no-df max-mss 224 fragment reassemble - [ Skip steps: p=end sa=36 sp=43 dp=35 ] +@33 scrub out proto tcp from any to <regress.2:*> fragment reassemble + [ Skip steps: d=35 p=end sa=37 sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@34 scrub proto tcp all random-id fragment reassemble - [ Skip steps: i=42 d=36 f=38 p=end sa=36 sp=43 da=38 ] +@34 scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 no-df max-mss 224 fragment reassemble + [ Skip steps: p=end sa=37 sp=44 dp=36 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@35 scrub proto tcp from any to any port = www fragment reassemble - [ Skip steps: i=42 f=38 p=end sp=43 da=38 dp=43 ] +@35 scrub proto tcp all random-id fragment reassemble + [ Skip steps: i=43 d=37 f=39 p=end sa=37 sp=44 da=39 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@36 scrub in proto tcp from <regress.1:*> to any port = www fragment reassemble - [ Skip steps: i=42 d=62 f=38 p=end sp=43 da=38 dp=43 ] +@36 scrub proto tcp from any to any port = www fragment reassemble + [ Skip steps: i=43 f=39 p=end sp=44 da=39 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@37 scrub in proto tcp from ! <regress.2:*> to any port = www fragment reassemble - [ Skip steps: i=42 d=62 p=end sp=43 dp=43 ] +@37 scrub in proto tcp from <regress.1:*> to any port = www fragment reassemble + [ Skip steps: i=43 d=63 f=39 p=end sp=44 da=39 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@38 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = www fragment reassemble - [ Skip steps: i=42 d=62 f=42 p=end sa=40 sp=43 dp=43 ] +@38 scrub in proto tcp from ! <regress.2:*> to any port = www fragment reassemble + [ Skip steps: i=43 d=63 p=end sp=44 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@39 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = www fragment reassemble - [ Skip steps: i=42 d=62 f=42 p=end sp=43 dp=43 ] +@39 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = www fragment reassemble + [ Skip steps: i=43 d=63 f=43 p=end sa=41 sp=44 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@40 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = www fragment reassemble - [ Skip steps: i=42 d=62 f=42 p=end sa=42 sp=43 dp=43 ] +@40 scrub in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = www fragment reassemble + [ Skip steps: i=43 d=63 f=43 p=end sp=44 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@41 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = www fragment reassemble - [ Skip steps: d=62 p=end sp=43 dp=43 ] +@41 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = www fragment reassemble + [ Skip steps: i=43 d=63 f=43 p=end sa=43 sp=44 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@42 scrub in log on lo0 proto tcp from any to any port = www min-ttl 25 fragment reassemble - [ Skip steps: i=46 d=62 p=end ] +@42 scrub in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = www fragment reassemble + [ Skip steps: d=63 p=end sp=44 dp=44 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@43 scrub in log on lo0 inet6 proto tcp from (lo1000000:*) port = www to 2000::1 fragment reassemble - [ Skip steps: i=46 d=62 f=45 p=end sp=48 da=45 dp=49 ] +@43 scrub in log on lo0 proto tcp from any to any port = www min-ttl 25 fragment reassemble + [ Skip steps: i=47 d=63 p=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@44 scrub in log on lo0 inet6 proto tcp from (lo0:2) port = www to 2000::1 fragment reassemble - [ Skip steps: i=46 d=62 p=end sp=48 dp=49 ] +@44 scrub in log on lo0 inet6 proto tcp from (lo1000000:*) port = www to 2000::1 fragment reassemble + [ Skip steps: i=47 d=63 f=46 p=end sp=49 da=46 dp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@45 scrub in log on lo0 proto tcp from any port = www to any fragment reassemble - [ Skip steps: d=62 f=61 p=end sa=61 sp=48 da=63 dp=49 ] +@45 scrub in log on lo0 inet6 proto tcp from (lo0:2) port = www to 2000::1 fragment reassemble + [ Skip steps: i=47 d=63 p=end sp=49 dp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@46 scrub in log on lo1000000 proto tcp from any port = www to any fragment reassemble - [ Skip steps: d=62 f=61 p=end sa=61 sp=48 da=63 dp=49 ] +@46 scrub in log on lo0 proto tcp from any port = www to any fragment reassemble + [ Skip steps: d=63 f=62 p=end sa=62 sp=49 da=64 dp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@47 scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 dp=49 ] +@47 scrub in log on lo1000000 proto tcp from any port = www to any fragment reassemble + [ Skip steps: d=63 f=62 p=end sa=62 sp=49 da=64 dp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@48 scrub in on lo0 proto tcp from any port = 81 to any no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 ] +@48 scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 dp=50 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@49 scrub in on lo0 proto tcp from any to any port = www max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 ] +@49 scrub in on lo0 proto tcp from any port = 81 to any no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@50 scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 sp=52 da=63 dp=52 ] +@50 scrub in on lo0 proto tcp from any to any port = www max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@51 scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment drop-ovl - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 ] +@51 scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 sp=53 da=64 dp=53 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@52 scrub in on lo0 proto tcp from any to any port = www no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 sp=55 da=63 ] +@52 scrub in on lo0 proto tcp from any port = www to any no-df min-ttl 15 max-mss 224 fragment drop-ovl + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@53 scrub in on lo0 proto tcp from any to any port = 81 no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 sp=55 da=63 ] +@53 scrub in on lo0 proto tcp from any to any port = www no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 sp=56 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@54 scrub in on lo0 proto tcp from any to any port = 82 no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 ] +@54 scrub in on lo0 proto tcp from any to any port = 81 no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 sp=56 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@55 scrub in on lo0 proto tcp from any port = www to any port = www no-df fragment reassemble - [ Skip steps: i=63 d=62 f=61 p=end sa=61 sp=58 da=63 dp=57 ] +@55 scrub in on lo0 proto tcp from any to any port = 82 no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@56 scrub in on lo0 proto tcp from any port = www to any port = www no-df min-ttl 15 max-mss 224 fragment crop - [ Skip steps: i=63 d=62 f=61 p=end sa=61 sp=58 da=63 ] +@56 scrub in on lo0 proto tcp from any port = www to any port = www no-df fragment reassemble + [ Skip steps: i=64 d=63 f=62 p=end sa=62 sp=59 da=64 dp=58 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@57 scrub in on lo0 proto tcp from any port = www to any port = 81 no-df min-ttl 15 max-mss 224 fragment crop - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 ] +@57 scrub in on lo0 proto tcp from any port = www to any port = www no-df min-ttl 15 max-mss 224 fragment crop + [ Skip steps: i=64 d=63 f=62 p=end sa=62 sp=59 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@58 scrub in on lo0 proto tcp from any port = 81 to any port = www no-df min-ttl 15 max-mss 224 fragment crop - [ Skip steps: i=63 d=62 f=61 p=end sa=61 sp=60 da=63 ] +@58 scrub in on lo0 proto tcp from any port = www to any port = 81 no-df min-ttl 15 max-mss 224 fragment crop + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@59 scrub in on lo0 proto tcp from any port = 81 to any port = 81 no-df min-ttl 15 max-mss 224 fragment crop - [ Skip steps: i=63 d=62 f=61 p=end sa=61 da=63 ] +@59 scrub in on lo0 proto tcp from any port = 81 to any port = www no-df min-ttl 15 max-mss 224 fragment crop + [ Skip steps: i=64 d=63 f=62 p=end sa=62 sp=61 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@60 scrub in on lo0 proto tcp from any to any port = 83 no-df min-ttl 15 max-mss 224 fragment reassemble - [ Skip steps: i=63 d=62 p=end da=63 ] +@60 scrub in on lo0 proto tcp from any port = 81 to any port = 81 no-df min-ttl 15 max-mss 224 fragment crop + [ Skip steps: i=64 d=63 f=62 p=end sa=62 da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@61 scrub in on lo0 inet proto tcp from (lo0:1) port = www to any fragment reassemble - [ Skip steps: i=63 p=end da=63 ] +@61 scrub in on lo0 proto tcp from any to any port = 83 no-df min-ttl 15 max-mss 224 fragment reassemble + [ Skip steps: i=64 d=63 p=end da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@62 scrub on lo0 proto tcp from any to any port = www max-mss 224 fragment reassemble - [ Skip steps: f=65 p=end sa=end sp=end dp=end ] +@62 scrub in on lo0 inet proto tcp from (lo0:1) port = www to any fragment reassemble + [ Skip steps: i=64 p=end da=64 ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@63 scrub out proto tcp from any to ! <regress.1:*> port = www fragment reassemble - [ Skip steps: i=65 d=end f=65 p=end sa=end sp=end dp=end ] +@63 scrub on lo0 proto tcp from any to any port = www max-mss 224 fragment reassemble + [ Skip steps: f=66 p=end sa=end sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] -@64 scrub out proto tcp from any to <regress.2:*> port = www fragment reassemble +@64 scrub out proto tcp from any to ! <regress.1:*> port = www fragment reassemble + [ Skip steps: i=66 d=end f=66 p=end sa=end sp=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@65 scrub out proto tcp from any to <regress.2:*> port = www fragment reassemble [ Skip steps: 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 ] -@65 scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www no-df max-mss 224 fragment reassemble +@66 scrub out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www no-df max-mss 224 fragment reassemble [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] diff --git a/regress/sbin/pfctl/pf68.ok b/regress/sbin/pfctl/pf68.ok index ec333425a8f..cec405c7ad0 100644 --- a/regress/sbin/pfctl/pf68.ok +++ b/regress/sbin/pfctl/pf68.ok @@ -1,3 +1,4 @@ +no scrub on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = www scrub proto tcp all fragment reassemble scrub proto tcp all fragment reassemble scrub proto tcp all fragment reassemble |