diff options
author | David Krause <david@cvs.openbsd.org> | 2008-06-16 03:24:44 +0000 |
---|---|---|
committer | David Krause <david@cvs.openbsd.org> | 2008-06-16 03:24:44 +0000 |
commit | 643a45364eac70777da8c18ea9bcad642ef56339 (patch) | |
tree | 9964c425f6620e264f685c0804aaa6592eb3e93a /regress/sbin/pfctl | |
parent | 13ff0503146a45c2af51ea4bd082389f49d8d97a (diff) |
fix regress after scrub TOS and tagging additions; "commit it" henning@
Diffstat (limited to 'regress/sbin/pfctl')
-rw-r--r-- | regress/sbin/pfctl/pf15.loaded | 72 | ||||
-rw-r--r-- | regress/sbin/pfctl/pf15.optimized | 72 |
2 files changed, 92 insertions, 52 deletions
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded index d195ad407e3..988e36fd70d 100644 --- a/regress/sbin/pfctl/pf15.loaded +++ b/regress/sbin/pfctl/pf15.loaded @@ -1,108 +1,128 @@ @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 ] + [ Skip steps: i=4 p=27 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=4 d=3 f=4 p=27 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 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 ] + [ Skip steps: i=4 f=4 p=27 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 on lo0 all max-mss 224 fragment reassemble - [ Skip steps: p=end sa=8 sp=end dp=end ] + [ Skip steps: p=27 sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: p=27 sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=7 d=27 f=8 p=27 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 lo0 all fragment reassemble - [ Skip steps: d=end f=8 p=end sa=8 sp=end da=9 dp=end ] + [ Skip steps: d=27 f=8 p=27 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 log on lo1000000 all fragment reassemble - [ Skip steps: d=end p=end sp=end da=9 dp=end ] + [ Skip steps: d=27 p=27 sp=end da=9 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=11 d=27 p=27 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 (lo1000000:*) to 2000::1 fragment reassemble - [ Skip steps: i=11 d=end f=11 p=end sp=end da=11 dp=end ] + [ Skip steps: i=11 d=27 f=11 p=27 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 ] + [ Skip steps: d=27 p=27 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.3 fragment reassemble - [ Skip steps: i=17 d=end f=16 p=end sa=13 sp=end dp=end ] + [ Skip steps: i=17 d=27 f=16 p=27 sa=13 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.1 to 10.0.0.4 fragment reassemble - [ Skip steps: i=17 d=end f=16 p=end sp=end dp=end ] + [ Skip steps: i=17 d=27 f=16 p=27 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.3 fragment reassemble - [ Skip steps: i=17 d=end f=16 p=end sa=15 sp=end dp=end ] + [ Skip steps: i=17 d=27 f=16 p=27 sa=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=17 d=27 f=16 p=27 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=17 d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 scrub in inet6 from ::1 to any fragment reassemble - [ Skip steps: d=end f=18 p=end sp=end da=end dp=end ] + [ Skip steps: d=27 f=18 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: d=27 p=27 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.1.1.1 to any fragment reassemble - [ Skip steps: i=22 d=end f=21 p=end sp=end da=end dp=end ] + [ Skip steps: i=22 d=27 f=21 p=27 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 10.0.0.1 to any fragment reassemble - [ Skip steps: i=22 d=end f=21 p=end sp=end da=end dp=end ] + [ Skip steps: i=22 d=27 f=21 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=22 d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 scrub in inet6 from ::1 to any fragment reassemble - [ Skip steps: d=end f=23 p=end sp=end da=end dp=end ] + [ Skip steps: d=27 f=23 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=25 d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 scrub in inet6 from ! ::1 to any fragment reassemble - [ Skip steps: d=end f=26 p=end sp=end da=end dp=end ] + [ Skip steps: d=27 f=26 p=27 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 inet6 from ! fe80::1 to any fragment reassemble - [ Skip steps: d=end p=end sp=end da=end dp=end ] + [ Skip steps: d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 scrub in on ! lo0 all fragment reassemble + [ Skip steps: f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@27 scrub proto udp all set-tos 0x10 fragment reassemble + [ Skip steps: i=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@28 scrub out proto esp all set-tos 0x08 fragment reassemble + [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@29 scrub out proto ah all set-tos 0x04 fragment reassemble + [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@30 scrub out proto icmp all set-tos 0x12 fragment reassemble + [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@31 scrub out all set-tos 0x08 fragment reassemble tagged THROUGHPUT [ 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.optimized b/regress/sbin/pfctl/pf15.optimized index d195ad407e3..988e36fd70d 100644 --- a/regress/sbin/pfctl/pf15.optimized +++ b/regress/sbin/pfctl/pf15.optimized @@ -1,108 +1,128 @@ @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 ] + [ Skip steps: i=4 p=27 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=4 d=3 f=4 p=27 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 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 ] + [ Skip steps: i=4 f=4 p=27 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 on lo0 all max-mss 224 fragment reassemble - [ Skip steps: p=end sa=8 sp=end dp=end ] + [ Skip steps: p=27 sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: p=27 sa=8 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=7 d=27 f=8 p=27 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 lo0 all fragment reassemble - [ Skip steps: d=end f=8 p=end sa=8 sp=end da=9 dp=end ] + [ Skip steps: d=27 f=8 p=27 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 log on lo1000000 all fragment reassemble - [ Skip steps: d=end p=end sp=end da=9 dp=end ] + [ Skip steps: d=27 p=27 sp=end da=9 dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=11 d=27 p=27 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 (lo1000000:*) to 2000::1 fragment reassemble - [ Skip steps: i=11 d=end f=11 p=end sp=end da=11 dp=end ] + [ Skip steps: i=11 d=27 f=11 p=27 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 ] + [ Skip steps: d=27 p=27 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.3 fragment reassemble - [ Skip steps: i=17 d=end f=16 p=end sa=13 sp=end dp=end ] + [ Skip steps: i=17 d=27 f=16 p=27 sa=13 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.1 to 10.0.0.4 fragment reassemble - [ Skip steps: i=17 d=end f=16 p=end sp=end dp=end ] + [ Skip steps: i=17 d=27 f=16 p=27 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.3 fragment reassemble - [ Skip steps: i=17 d=end f=16 p=end sa=15 sp=end dp=end ] + [ Skip steps: i=17 d=27 f=16 p=27 sa=15 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=17 d=27 f=16 p=27 sp=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=17 d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @16 scrub in inet6 from ::1 to any fragment reassemble - [ Skip steps: d=end f=18 p=end sp=end da=end dp=end ] + [ Skip steps: d=27 f=18 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: d=27 p=27 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.1.1.1 to any fragment reassemble - [ Skip steps: i=22 d=end f=21 p=end sp=end da=end dp=end ] + [ Skip steps: i=22 d=27 f=21 p=27 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 10.0.0.1 to any fragment reassemble - [ Skip steps: i=22 d=end f=21 p=end sp=end da=end dp=end ] + [ Skip steps: i=22 d=27 f=21 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=22 d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @21 scrub in inet6 from ::1 to any fragment reassemble - [ Skip steps: d=end f=23 p=end sp=end da=end dp=end ] + [ Skip steps: d=27 f=23 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @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 ] + [ Skip steps: i=25 d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @24 scrub in inet6 from ! ::1 to any fragment reassemble - [ Skip steps: d=end f=26 p=end sp=end da=end dp=end ] + [ Skip steps: d=27 f=26 p=27 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 inet6 from ! fe80::1 to any fragment reassemble - [ Skip steps: d=end p=end sp=end da=end dp=end ] + [ Skip steps: d=27 p=27 sp=end da=end dp=end ] [ queue: qname= qid=0 pqname= pqid=0 ] [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] @26 scrub in on ! lo0 all fragment reassemble + [ Skip steps: f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@27 scrub proto udp all set-tos 0x10 fragment reassemble + [ Skip steps: i=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@28 scrub out proto esp all set-tos 0x08 fragment reassemble + [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@29 scrub out proto ah all set-tos 0x04 fragment reassemble + [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@30 scrub out proto icmp all set-tos 0x12 fragment reassemble + [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ] + [ queue: qname= qid=0 pqname= pqid=0 ] + [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ] +@31 scrub out all set-tos 0x08 fragment reassemble tagged THROUGHPUT [ 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 ] |