regression tests for options in pf.conf

ok dhartmei@, kjell@

4 files changed, 22 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 270f5e44edc..1a80a6f7876 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.19 2002/06/11 18:07:49 frantzen Exp $
+# $OpenBSD: Makefile,v 1.20 2002/06/25 08:17:16 henning Exp $
 
-PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
-PFFAIL=1 2 3 4 5 6 7 8 9 10
+PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
+PFFAIL=1 2 3 4 5 6 7 8 9 10 11
 
 .for n in ${PFFAIL}
 REGRESSTARGETS+=pfail${n}
diff --git a/regress/sbin/pfctl/pf22.in b/regress/sbin/pfctl/pf22.in
new file mode 100644
index 00000000000..8e700788b81
--- /dev/null
+++ b/regress/sbin/pfctl/pf22.in
@@ -0,0 +1,6 @@
+set optimization aggressive
+set timeout { tcp.closing 6, tcp.opening 6 }
+set timeout tcp.first 6
+set limit states 500
+set limit {states 1000,frags 1000}
+set loginterface lo0
diff --git a/regress/sbin/pfctl/pf22.ok b/regress/sbin/pfctl/pf22.ok
new file mode 100644
index 00000000000..f711ed0a42d
--- /dev/null
+++ b/regress/sbin/pfctl/pf22.ok
@@ -0,0 +1,8 @@
+set optimization aggressive
+set timeout tcp.closing 6s
+set timeout tcp.opening 6s
+set timeout tcp.first 6s
+set limit states 500
+set limit states 1000
+set limit frags 1000
+set loginterface lo0
diff --git a/regress/sbin/pfctl/pfail11.in b/regress/sbin/pfctl/pfail11.in
new file mode 100644
index 00000000000..94ae234e976
--- /dev/null
+++ b/regress/sbin/pfctl/pfail11.in
@@ -0,0 +1,5 @@
+set optimization aggressive
+set timeout tcp.closing 6, tcp.opening 6
+pass in all
+set limit states 1000, frags 1000
+set loginterface lo0