summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobhe <tobhe@openbsd.org>2020-11-05 21:55:11 +0000
committertobhe <tobhe@openbsd.org>2020-11-05 21:55:11 +0000
commite6807b7fc0a9ef5f7bd4fd6079bb75997917623f (patch)
treedae51f666fd3b416b93879c9d505c0a48d2969e6
parentSkip test if web server cannot be pinged. (diff)
downloadwireguard-openbsd-e6807b7fc0a9ef5f7bd4fd6079bb75997917623f.tar.xz
wireguard-openbsd-e6807b7fc0a9ef5f7bd4fd6079bb75997917623f.zip
Make sure IPsec flows are loaded with srcid/dstid attributes.
-rw-r--r--regress/sbin/iked/live/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/regress/sbin/iked/live/Makefile b/regress/sbin/iked/live/Makefile
index 0d76972716c..ab90329ab22 100644
--- a/regress/sbin/iked/live/Makefile
+++ b/regress/sbin/iked/live/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2020/11/05 20:04:42 tobhe Exp $
+# $OpenBSD: Makefile,v 1.24 2020/11/05 21:55:11 tobhe Exp $
# Copyright (c) 2020 Tobias Heider <tobhe@openbsd.org>
#
@@ -38,9 +38,13 @@ TEST_FLOWS = \
ipsecctlleft=`ssh ${LEFT_SSH} ipsecctl -sa`; \
ipsecctlright=`ssh ${RIGHT_SSH} ipsecctl -sa`; \
flowleft=`echo "$$ipsecctlleft" \
- | sed -n "/^flow $$flowtype in from ${RIGHT_ADDR} to ${LEFT_ADDR}/p"`; \
+ | sed -E -n "/^flow $$flowtype in from ${RIGHT_ADDR}\
+ to ${LEFT_ADDR} peer ${RIGHT_ADDR} srcid (FQDN|UFQDN|ASN1_DN)\/[^ ]*\
+ dstid (FQDN|UFQDN|ASN1_DN)\/[^ ]*/p"`; \
flowright=`echo "$$ipsecctlright" \
- | sed -n "/^flow $$flowtype in from ${LEFT_ADDR} to ${RIGHT_ADDR}/p"`; \
+ | sed -E -n "/^flow $$flowtype in from ${LEFT_ADDR}\
+ to ${RIGHT_ADDR} peer ${LEFT_ADDR} srcid (FQDN|UFQDN|ASN1_DN)\/[^ ]*\
+ dstid (FQDN|UFQDN|ASN1_DN)\/[^ ]*/p"`; \
saleft_rtol=`echo "$$ipsecctlleft" \
| sed -n "/^$$flowtype $$tmode from ${RIGHT_ADDR} to ${LEFT_ADDR}/p"`; \
saleft_ltor=`echo "$$ipsecctlleft" \