krause found one more untested thing: per-rule timeouts and per-rule state

limit.
woohoo!

4 files changed, 15 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index b2df59c16d3..75d21cc7f61 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2003/02/21 20:11:20 henning Exp $
+# $OpenBSD: Makefile,v 1.92 2003/02/22 19:03:21 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -12,12 +12,12 @@
 
 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
+PFTESTS+=51 52 53 54 55 56
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 PFSIMPLE=1
 PFSETUP=1 2 3
 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 49 54
+PFLOAD+=30 31 32 34 36 38 39 40 44 46 47 49 54 56
 # disabled; no altq in anchors
 # PFLOAD+=33 35 37 42 43 45 51
 # disabled; no table def in anchors
diff --git a/regress/sbin/pfctl/pf56.in b/regress/sbin/pfctl/pf56.in
new file mode 100644
index 00000000000..016893f233a
--- /dev/null
+++ b/regress/sbin/pfctl/pf56.in
@@ -0,0 +1,2 @@
+pass in proto tcp from any to any port www keep state (tcp.established 60)
+pass in proto tcp from any to any port www keep state (max 10, tcp.first 2)
diff --git a/regress/sbin/pfctl/pf56.loaded b/regress/sbin/pfctl/pf56.loaded
new file mode 100644
index 00000000000..52630fb8417
--- /dev/null
+++ b/regress/sbin/pfctl/pf56.loaded
@@ -0,0 +1,8 @@
+@0 pass in proto tcp from any to any port = www keep state (tcp.established 60) 
+[ 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 proto tcp from any to any port = www keep state (max 10, tcp.first 2) 
+[ 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/pf56.ok b/regress/sbin/pfctl/pf56.ok
new file mode 100644
index 00000000000..a44cc06e648
--- /dev/null
+++ b/regress/sbin/pfctl/pf56.ok
@@ -0,0 +1,2 @@
+pass in proto tcp from any to any port = www keep state (tcp.established 60) 
+pass in proto tcp from any to any port = www keep state (max 10, tcp.first 2)