update after the "reassemble tcp" fix (kernel/6178); ok sthen@

9 files changed, 98 insertions, 70 deletions

diff --git a/regress/sbin/pfctl/pf44.loaded b/regress/sbin/pfctl/pf44.loaded
index 78d7dd6416e..9f0b8e3807f 100644
--- a/regress/sbin/pfctl/pf44.loaded
+++ b/regress/sbin/pfctl/pf44.loaded
@@ -18,7 +18,7 @@
   [ 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     ]
-@5 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
+@5 match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
   [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf44.ok b/regress/sbin/pfctl/pf44.ok
index c105cc76913..14d511fc90c 100644
--- a/regress/sbin/pfctl/pf44.ok
+++ b/regress/sbin/pfctl/pf44.ok
@@ -1,6 +1,6 @@
-match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
-match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
-match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
-match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
-match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
+match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
+match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
+match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
+match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
+match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
 match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
diff --git a/regress/sbin/pfctl/pf44.optimized b/regress/sbin/pfctl/pf44.optimized
index 583af2ea793..e17fe45c1f8 100644
--- a/regress/sbin/pfctl/pf44.optimized
+++ b/regress/sbin/pfctl/pf44.optimized
@@ -2,3 +2,7 @@
   [ 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     ]
+@1 match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
+  [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf68.loaded b/regress/sbin/pfctl/pf68.loaded
index 7979d1b51d2..addbae1904b 100644
--- a/regress/sbin/pfctl/pf68.loaded
+++ b/regress/sbin/pfctl/pf68.loaded
@@ -22,7 +22,7 @@
   [ Skip steps: i=13 d=25 f=9 p=end sa=7 sp=39 da=9 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@6 match in proto tcp all
+@6 match in proto tcp all scrub (reassemble tcp)
   [ Skip steps: i=13 d=25 f=9 p=end sp=39 da=9 dp=31 ]
   [ 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 598b94217b1..273073f8507 100644
--- a/regress/sbin/pfctl/pf68.ok
+++ b/regress/sbin/pfctl/pf68.ok
@@ -4,7 +4,7 @@ match proto tcp all
 match proto tcp all
 match in proto tcp all
 match in proto tcp all
-match in proto tcp all
+match in proto tcp all scrub (reassemble tcp)
 match in proto tcp from <regress.1> to any
 match in proto tcp from ! <regress.2> to any
 match in inet proto tcp from 10.0.0.1 to 10.0.0.3
diff --git a/regress/sbin/pfctl/pf68.optimized b/regress/sbin/pfctl/pf68.optimized
index 86ec7173eff..b643819042c 100644
--- a/regress/sbin/pfctl/pf68.optimized
+++ b/regress/sbin/pfctl/pf68.optimized
@@ -1,124 +1,148 @@
 @0 match proto tcp all
-  [ Skip steps: i=2 f=11 p=end sp=16 da=9 dp=13 ]
+  [ Skip steps: i=8 f=2 p=end sa=2 sp=22 da=2 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 match in proto tcp from ! <regress.2:*> to any
-  [ Skip steps: d=8 f=11 p=end sp=16 da=9 dp=13 ]
+@1 match in proto tcp all scrub (reassemble tcp)
+  [ Skip steps: i=8 d=14 p=end sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@2 match in log on lo0 proto tcp all scrub (min-ttl 25)
-  [ Skip steps: d=8 f=11 p=end sa=14 sp=16 da=9 dp=13 ]
+@2 match in inet proto tcp from 10.0.0.1 to 10.0.0.3
+  [ Skip steps: i=8 d=14 f=6 p=end sa=4 sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@3 match in log on lo1000000 proto tcp all
-  [ Skip steps: d=8 f=11 p=end sa=14 sp=16 da=9 dp=13 ]
+@3 match in inet proto tcp from 10.0.0.1 to 10.0.0.4
+  [ Skip steps: i=8 d=14 f=6 p=end sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@4 match in on lo0 proto tcp all
-  [ Skip steps: i=8 d=8 f=11 p=end sa=14 sp=16 da=9 dp=13 ]
+@4 match in inet proto tcp from 10.0.0.2 to 10.0.0.3
+  [ Skip steps: i=8 d=14 f=6 p=end sa=6 sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@5 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=8 d=8 f=11 p=end sa=14 sp=16 da=9 dp=13 ]
+@5 match in inet proto tcp from 10.0.0.2 to 10.0.0.4
+  [ Skip steps: i=8 d=14 p=end sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@6 match in on lo0 proto tcp all scrub (max-mss 224)
-  [ Skip steps: i=8 d=8 f=11 p=end sa=14 sp=16 da=9 dp=13 ]
+@6 match in proto tcp from <regress.1:*> to any
+  [ Skip steps: i=8 d=14 f=17 p=end sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@7 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: f=11 p=end sa=14 sp=16 da=9 dp=13 ]
+@7 match in proto tcp from ! <regress.2:*> to any
+  [ Skip steps: d=14 f=17 p=end sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@8 match out proto tcp all
-  [ Skip steps: i=10 d=10 f=11 p=end sa=14 sp=16 dp=13 ]
+@8 match in log on lo0 proto tcp all scrub (min-ttl 25)
+  [ Skip steps: d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@9 match out proto tcp from any to ! <regress.1:*>
-  [ Skip steps: f=11 p=end sa=14 sp=16 dp=13 ]
+@9 match in log on lo1000000 proto tcp all
+  [ Skip steps: d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@10 match on lo0 proto tcp all scrub (max-mss 224)
-  [ Skip steps: p=end sa=14 sp=16 dp=13 ]
+@10 match in on lo0 proto tcp all
+  [ Skip steps: i=14 d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@11 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 scrub (no-df max-mss 224)
-  [ Skip steps: p=end sa=14 sp=16 dp=13 ]
+@11 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=14 d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@12 match proto tcp all scrub (random-id)
-  [ Skip steps: i=15 d=14 f=29 p=end sa=14 sp=16 da=26 ]
+@12 match in on lo0 proto tcp all scrub (max-mss 224)
+  [ Skip steps: i=14 d=14 f=17 p=end sa=20 sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@13 match proto tcp from any to any port = www
-  [ Skip steps: i=15 f=29 p=end sp=16 da=26 dp=16 ]
+@13 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: f=17 p=end sa=20 sp=22 da=15 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@14 match in proto tcp from ! <regress.2:*> to any port = www
-  [ Skip steps: d=26 f=29 p=end sp=16 da=26 dp=16 ]
+@14 match out proto tcp all
+  [ Skip steps: i=16 d=16 f=17 p=end sa=20 sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@15 match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25)
-  [ Skip steps: i=17 d=26 f=29 p=end sa=29 da=26 ]
+@15 match out proto tcp from any to ! <regress.1:*>
+  [ Skip steps: f=17 p=end sa=20 sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@16 match in log on lo0 proto tcp from any port = www to any
-  [ Skip steps: d=26 f=29 p=end sa=29 sp=19 da=26 dp=20 ]
+@16 match on lo0 proto tcp all scrub (max-mss 224)
+  [ Skip steps: p=end sa=20 sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@17 match in log on lo1000000 proto tcp from any port = www to any
-  [ Skip steps: d=26 f=29 p=end sa=29 sp=19 da=26 dp=20 ]
+@17 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 scrub (no-df max-mss 224)
+  [ Skip steps: p=end sa=20 sp=22 dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@18 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 da=26 dp=20 ]
+@18 match proto tcp all scrub (random-id)
+  [ Skip steps: i=21 d=20 f=35 p=end sa=20 sp=22 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@19 match in on lo0 proto tcp from any port = 81 to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 da=26 ]
+@19 match proto tcp from any to any port = www
+  [ Skip steps: i=21 f=35 p=end sp=22 da=32 dp=22 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@20 match in on lo0 proto tcp from any to any port = www scrub (max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 da=26 ]
+@20 match in proto tcp from ! <regress.2:*> to any port = www
+  [ Skip steps: d=32 f=35 p=end sp=22 da=32 dp=22 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@21 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 da=26 ]
+@21 match in log on lo0 proto tcp from any to any port = www scrub (min-ttl 25)
+  [ Skip steps: i=23 d=32 f=35 p=end sa=35 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@22 match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 sp=29 da=26 ]
+@22 match in log on lo0 proto tcp from any port = www to any
+  [ Skip steps: d=32 f=35 p=end sa=35 sp=25 da=32 dp=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@23 match in on lo0 proto tcp from any to any port = 81 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 sp=29 da=26 ]
+@23 match in log on lo1000000 proto tcp from any port = www to any
+  [ Skip steps: d=32 f=35 p=end sa=35 sp=25 da=32 dp=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@24 match in on lo0 proto tcp from any to any port = 82 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 d=26 f=29 p=end sa=29 sp=29 da=26 ]
+@24 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 dp=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@25 match in on lo0 proto tcp from any to any port = 83 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: f=29 p=end sa=29 sp=29 ]
+@25 match in on lo0 proto tcp from any port = 81 to any scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@26 match out proto tcp from any to ! <regress.1:*> port = www
-  [ Skip steps: i=28 d=28 f=29 p=end sa=29 sp=29 dp=29 ]
+@26 match in on lo0 proto tcp from any to any port = www scrub (max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@27 match out proto tcp from any to <regress.2:*> port = www
-  [ Skip steps: f=29 p=end sa=29 sp=29 dp=29 ]
+@27 match in on lo0 proto tcp from any port = www to any scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@28 match on lo0 proto tcp from any to any port = www scrub (max-mss 224)
-  [ Skip steps: i=30 p=end da=30 ]
+@28 match in on lo0 proto tcp from any to any port = www scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 sp=35 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@29 match in on lo0 inet proto tcp from (lo0:1) port = www to any
+@29 match in on lo0 proto tcp from any to any port = 81 scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 sp=35 da=32 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@30 match in on lo0 proto tcp from any to any port = 82 scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: i=32 d=32 f=35 p=end sa=35 sp=35 da=32 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@31 match in on lo0 proto tcp from any to any port = 83 scrub (no-df min-ttl 15 max-mss 224)
+  [ Skip steps: f=35 p=end sa=35 sp=35 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@32 match out proto tcp from any to ! <regress.1:*> port = www
+  [ Skip steps: i=34 d=34 f=35 p=end sa=35 sp=35 dp=35 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@33 match out proto tcp from any to <regress.2:*> port = www
+  [ Skip steps: f=35 p=end sa=35 sp=35 dp=35 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@34 match on lo0 proto tcp from any to any port = www scrub (max-mss 224)
+  [ Skip steps: i=36 p=end da=36 ]
+  [ queue: qname= qid=0 pqname= pqid=0 ]
+  [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+@35 match in on lo0 inet proto tcp from (lo0:1) port = www to any
   [ Skip steps: f=end p=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@30 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224)
+@36 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = www scrub (no-df max-mss 224)
   [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf73.loaded b/regress/sbin/pfctl/pf73.loaded
index d8983907b08..ffc4d0bf289 100644
--- a/regress/sbin/pfctl/pf73.loaded
+++ b/regress/sbin/pfctl/pf73.loaded
@@ -1,4 +1,4 @@
-@0 pass proto tcp all flags S/SA keep state
+@0 pass proto tcp all flags S/SA keep state scrub (reassemble tcp)
   [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf73.ok b/regress/sbin/pfctl/pf73.ok
index 050a094ac13..8d299ff3b1f 100644
--- a/regress/sbin/pfctl/pf73.ok
+++ b/regress/sbin/pfctl/pf73.ok
@@ -1 +1 @@
-pass proto tcp all flags S/SA keep state
+pass proto tcp all flags S/SA keep state scrub (reassemble tcp)
diff --git a/regress/sbin/pfctl/pf73.optimized b/regress/sbin/pfctl/pf73.optimized
index d8983907b08..ffc4d0bf289 100644
--- a/regress/sbin/pfctl/pf73.optimized
+++ b/regress/sbin/pfctl/pf73.optimized
@@ -1,4 +1,4 @@
-@0 pass proto tcp all flags S/SA keep state
+@0 pass proto tcp all flags S/SA keep state scrub (reassemble tcp)
   [ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]