allow specification of encapsulated protocol for flows; ok hshoexer

3 files changed, 13 insertions, 3 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 414a881bb49..b42b47a164c 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/03/30 13:40:44 reyk Exp $
+# $OpenBSD: Makefile,v 1.15 2006/03/31 13:13:51 markus Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -7,11 +7,11 @@
 # 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
+IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 TCPMD5TESTS=1 2 3
 SATESTS=1 2 3 4 5 6 7 8 9 10
 SAFAIL=1
-IKETESTS=1 2 3 4 5 6 7 8 9
+IKETESTS=1 2 3 4 5 6 7 8
 
 SHELL=/bin/sh
 
diff --git a/regress/sbin/ipsecctl/ipsec19.in b/regress/sbin/ipsecctl/ipsec19.in
new file mode 100644
index 00000000000..0e376819ecd
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec19.in
@@ -0,0 +1,2 @@
+flow esp proto etherip from 1.1.1.1 to 2.2.2.2
+flow esp proto 97 from 2.2.2.2 to 3.3.3.3
diff --git a/regress/sbin/ipsecctl/ipsec19.ok b/regress/sbin/ipsecctl/ipsec19.ok
new file mode 100644
index 00000000000..0c24f6f84df
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec19.ok
@@ -0,0 +1,8 @@
+flow esp out proto etherip from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2
+	type require
+flow esp in proto etherip from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2
+	type use
+flow esp out proto etherip from 2.2.2.2 to 3.3.3.3 peer 3.3.3.3
+	type require
+flow esp in proto etherip from 3.3.3.3 to 2.2.2.2 peer 3.3.3.3
+	type use