tests for "scrub tcp reassemble"

4 files changed, 130 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 74b354aa139..9ad71de9e11 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.142 2003/05/14 22:55:34 henning Exp $
+# $OpenBSD: Makefile,v 1.143 2003/05/15 00:11:48 frantzen Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -12,14 +12,14 @@
 
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
-PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
+PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFFAIL+=28 29 30 31 32 33 34 35 36
 PFSIMPLE=1 2
 PFSETUP=1 2 3 4
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 23 24 25 26 27 28 29
 PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 48 49 54 56 60 61 65 66 67 68 69 70 71
-PFLOAD+=72
+PFLOAD+=72 73
 PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12 13 14
 # disabled; no altq in anchors
 # PFLOAD+=33 35 37 42 43 45 51 58 59 62 63 64
diff --git a/regress/sbin/pfctl/pf73.in b/regress/sbin/pfctl/pf73.in
new file mode 100644
index 00000000000..131756eef24
--- /dev/null
+++ b/regress/sbin/pfctl/pf73.in
@@ -0,0 +1,13 @@
+scrub proto tcp reassemble tcp
+scrub proto tcp all reassemble tcp
+scrub proto tcp from any to any reassemble tcp
+scrub proto tcp all fragment crop reassemble tcp
+scrub proto tcp all fragment drop-ovl reassemble tcp
+scrub proto tcp all reassemble tcp fragment reassemble
+scrub proto tcp from { <regress.1> !<regress.2> } to any reassemble tcp
+scrub inet proto tcp from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 } reassemble tcp
+scrub log on lo0 proto tcp from any to any min-ttl 25 reassemble tcp
+scrub log on lo0 inet6 proto tcp from { (lo1), (lo0) } to 2000::1 reassemble tcp
+scrub log on {lo0 lo1} proto tcp from any to any reassemble tcp
+scrub on lo0 proto tcp all reassemble tcp
+scrub on lo0 proto tcp from any to any fragment reassemble max-mss 224 min-ttl 15 no-df reassemble tcp
diff --git a/regress/sbin/pfctl/pf73.loaded b/regress/sbin/pfctl/pf73.loaded
new file mode 100644
index 00000000000..240703d783b
--- /dev/null
+++ b/regress/sbin/pfctl/pf73.loaded
@@ -0,0 +1,95 @@
+@0 scrub proto tcp all reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=8 p=end sa=6 sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@1 scrub proto tcp all reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=8 p=end sa=6 sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@2 scrub proto tcp all reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=8 p=end sa=6 sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@3 scrub proto tcp all reassemble tcp fragment crop 
+[ Skip steps: i=12 d=end f=8 p=end sa=6 sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@4 scrub proto tcp all reassemble tcp fragment drop-ovl 
+[ Skip steps: i=12 d=end f=8 p=end sa=6 sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@5 scrub proto tcp all reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=8 p=end sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@6 scrub proto tcp from <regress.1:*> to any reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=8 p=end sp=end da=8 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@7 scrub proto tcp from ! <regress.2:*> to any reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end p=end sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@8 scrub inet proto tcp from 10.0.0.1 to 10.0.0.3 reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=12 p=end sa=10 sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@9 scrub inet proto tcp from 10.0.0.1 to 10.0.0.4 reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=12 p=end sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@10 scrub inet proto tcp from 10.0.0.2 to 10.0.0.3 reassemble tcp fragment reassemble 
+[ Skip steps: i=12 d=end f=12 p=end sa=12 sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@11 scrub inet proto tcp from 10.0.0.2 to 10.0.0.4 reassemble tcp 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     ]
+
+@12 scrub log on lo0 proto tcp all min-ttl 25 reassemble tcp fragment reassemble 
+[ Skip steps: i=16 d=end p=end sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@13 scrub log on lo0 inet6 proto tcp from (lo1) to 2000::1 reassemble tcp fragment reassemble 
+[ Skip steps: i=16 d=end f=15 p=end sp=end da=15 dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@14 scrub log on lo0 inet6 proto tcp from (lo0) to 2000::1 reassemble tcp fragment reassemble 
+[ Skip steps: i=16 d=end p=end sp=end dp=end ]
+[ queue: qname= qid=0 pqname= pqid=0 ]
+[ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
+
+@15 scrub log on lo0 proto tcp all reassemble tcp fragment reassemble 
+[ Skip steps: 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     ]
+
+@16 scrub log on lo1 proto tcp all reassemble tcp fragment reassemble 
+[ Skip steps: 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     ]
+
+@17 scrub on lo0 proto tcp all reassemble tcp 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     ]
+
+@18 scrub on lo0 proto tcp all no-df min-ttl 15 max-mss 224 reassemble tcp 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/pf73.ok b/regress/sbin/pfctl/pf73.ok
new file mode 100644
index 00000000000..a9f7fecf7c9
--- /dev/null
+++ b/regress/sbin/pfctl/pf73.ok
@@ -0,0 +1,19 @@
+scrub proto tcp all reassemble tcp fragment reassemble 
+scrub proto tcp all reassemble tcp fragment reassemble 
+scrub proto tcp all reassemble tcp fragment reassemble 
+scrub proto tcp all reassemble tcp fragment crop 
+scrub proto tcp all reassemble tcp fragment drop-ovl 
+scrub proto tcp all reassemble tcp fragment reassemble 
+scrub proto tcp from <regress.1> to any reassemble tcp fragment reassemble 
+scrub proto tcp from ! <regress.2> to any reassemble tcp fragment reassemble 
+scrub inet proto tcp from 10.0.0.1 to 10.0.0.3 reassemble tcp fragment reassemble 
+scrub inet proto tcp from 10.0.0.1 to 10.0.0.4 reassemble tcp fragment reassemble 
+scrub inet proto tcp from 10.0.0.2 to 10.0.0.3 reassemble tcp fragment reassemble 
+scrub inet proto tcp from 10.0.0.2 to 10.0.0.4 reassemble tcp fragment reassemble 
+scrub log on lo0 proto tcp all min-ttl 25 reassemble tcp fragment reassemble 
+scrub log on lo0 inet6 proto tcp from (lo1) to 2000::1 reassemble tcp fragment reassemble 
+scrub log on lo0 inet6 proto tcp from (lo0) to 2000::1 reassemble tcp fragment reassemble 
+scrub log on lo0 proto tcp all reassemble tcp fragment reassemble 
+scrub log on lo1 proto tcp all reassemble tcp fragment reassemble 
+scrub on lo0 proto tcp all reassemble tcp fragment reassemble 
+scrub on lo0 proto tcp all no-df min-ttl 15 max-mss 224 reassemble tcp fragment reassemble