tests for rule expansion

7 files changed, 43 insertions, 2 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 229db023afc..052dea70ce6 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2006/04/19 16:13:41 hshoexer Exp $
+# $OpenBSD: Makefile,v 1.21 2006/05/30 19:25:23 hshoexer Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -7,7 +7,7 @@
 # sa:	 same as above, but for SA rules.
 # ike:	 same as above, but for ike rules.
 
-IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
+IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 TCPMD5TESTS=1 2 3
 SATESTS=1 2 3 4 5 6 7 8 9 10 11 12
 SAFAIL=1
diff --git a/regress/sbin/ipsecctl/ipsec22.in b/regress/sbin/ipsecctl/ipsec22.in
new file mode 100644
index 00000000000..d8473d57ae7
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec22.in
@@ -0,0 +1,2 @@
+FROM="{ 1.1.1.1, 2.2.2.2, 3.3.3.3 }"
+flow esp from $FROM to 4.4.4.4
diff --git a/regress/sbin/ipsecctl/ipsec22.ok b/regress/sbin/ipsecctl/ipsec22.ok
new file mode 100644
index 00000000000..ed14980df49
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec22.ok
@@ -0,0 +1,7 @@
+FROM = "{ 1.1.1.1, 2.2.2.2, 3.3.3.3 }"
+flow esp out from 1.1.1.1 to 4.4.4.4 peer 4.4.4.4 type require
+flow esp in from 4.4.4.4 to 1.1.1.1 peer 4.4.4.4 type require
+flow esp out from 2.2.2.2 to 4.4.4.4 peer 4.4.4.4 type require
+flow esp in from 4.4.4.4 to 2.2.2.2 peer 4.4.4.4 type require
+flow esp out from 3.3.3.3 to 4.4.4.4 peer 4.4.4.4 type require
+flow esp in from 4.4.4.4 to 3.3.3.3 peer 4.4.4.4 type require
diff --git a/regress/sbin/ipsecctl/ipsec23.in b/regress/sbin/ipsecctl/ipsec23.in
new file mode 100644
index 00000000000..c43bd91d37a
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec23.in
@@ -0,0 +1,2 @@
+TO="{ 1.1.1.1, 2.2.2.2, 3.3.3.3 }"
+flow esp from 4.4.4.4 to $TO
diff --git a/regress/sbin/ipsecctl/ipsec23.ok b/regress/sbin/ipsecctl/ipsec23.ok
new file mode 100644
index 00000000000..334f1ee1e71
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec23.ok
@@ -0,0 +1,7 @@
+TO = "{ 1.1.1.1, 2.2.2.2, 3.3.3.3 }"
+flow esp out from 4.4.4.4 to 1.1.1.1 peer 1.1.1.1 type require
+flow esp in from 1.1.1.1 to 4.4.4.4 peer 1.1.1.1 type require
+flow esp out from 4.4.4.4 to 2.2.2.2 peer 1.1.1.1 type require
+flow esp in from 2.2.2.2 to 4.4.4.4 peer 1.1.1.1 type require
+flow esp out from 4.4.4.4 to 3.3.3.3 peer 1.1.1.1 type require
+flow esp in from 3.3.3.3 to 4.4.4.4 peer 1.1.1.1 type require
diff --git a/regress/sbin/ipsecctl/ipsec24.in b/regress/sbin/ipsecctl/ipsec24.in
new file mode 100644
index 00000000000..5c93262c47d
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec24.in
@@ -0,0 +1,3 @@
+FROM="{ 1.1.1.1, 2.2.2.2, 3.3.3.3 }"
+TO="{ 4.4.4.4, 5.5.5.5, 6.6.6.6 }"
+flow esp from $FROM to $TO
diff --git a/regress/sbin/ipsecctl/ipsec24.ok b/regress/sbin/ipsecctl/ipsec24.ok
new file mode 100644
index 00000000000..db61535152d
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec24.ok
@@ -0,0 +1,20 @@
+FROM = "{ 1.1.1.1, 2.2.2.2, 3.3.3.3 }"
+TO = "{ 4.4.4.4, 5.5.5.5, 6.6.6.6 }"
+flow esp out from 1.1.1.1 to 4.4.4.4 peer 4.4.4.4 type require
+flow esp in from 4.4.4.4 to 1.1.1.1 peer 4.4.4.4 type require
+flow esp out from 1.1.1.1 to 5.5.5.5 peer 4.4.4.4 type require
+flow esp in from 5.5.5.5 to 1.1.1.1 peer 4.4.4.4 type require
+flow esp out from 1.1.1.1 to 6.6.6.6 peer 4.4.4.4 type require
+flow esp in from 6.6.6.6 to 1.1.1.1 peer 4.4.4.4 type require
+flow esp out from 2.2.2.2 to 4.4.4.4 peer 4.4.4.4 type require
+flow esp in from 4.4.4.4 to 2.2.2.2 peer 4.4.4.4 type require
+flow esp out from 2.2.2.2 to 5.5.5.5 peer 4.4.4.4 type require
+flow esp in from 5.5.5.5 to 2.2.2.2 peer 4.4.4.4 type require
+flow esp out from 2.2.2.2 to 6.6.6.6 peer 4.4.4.4 type require
+flow esp in from 6.6.6.6 to 2.2.2.2 peer 4.4.4.4 type require
+flow esp out from 3.3.3.3 to 4.4.4.4 peer 4.4.4.4 type require
+flow esp in from 4.4.4.4 to 3.3.3.3 peer 4.4.4.4 type require
+flow esp out from 3.3.3.3 to 5.5.5.5 peer 4.4.4.4 type require
+flow esp in from 5.5.5.5 to 3.3.3.3 peer 4.4.4.4 type require
+flow esp out from 3.3.3.3 to 6.6.6.6 peer 4.4.4.4 type require
+flow esp in from 6.6.6.6 to 3.3.3.3 peer 4.4.4.4 type require