From d8a4bbfc5e02c2b944702e0fcec8f4e97c404878 Mon Sep 17 00:00:00 2001 From: tobhe Date: Thu, 5 Nov 2020 21:55:12 +0000 Subject: Make sure IPsec flows are loaded with srcid/dstid attributes. --- regress/sbin/iked/live/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'regress/sbin/iked') 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 # @@ -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" \ -- cgit v1.2.3