X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=testing%2Fhosts%2Fdefault%2Fusr%2Flocal%2Fbin%2Fexpect-connection;h=ded9f791cd6baaa5992612153eb47b9f5c60bb9b;hp=10a7092555fd0d49390fde3b3f7a173b494c4c4e;hb=eb25b1a73d320532974dfd80411773673ea90820;hpb=76ccd25a050a543e9dfc5fd23d5ebe976660fccb diff --git a/testing/hosts/default/usr/local/bin/expect-connection b/testing/hosts/default/usr/local/bin/expect-connection index 10a7092..ded9f79 100755 --- a/testing/hosts/default/usr/local/bin/expect-connection +++ b/testing/hosts/default/usr/local/bin/expect-connection @@ -15,10 +15,16 @@ fi secs=$2 [ ! $secs ] && secs=5 +cmd="swanctl --list-conns" +grep 'load.*stroke' /etc/strongswan.conf >/dev/null +if [ $? -eq 0 -o -n "$DAEMON_NAME" ]; then + cmd="ipsec statusall" +fi + let steps=$secs*10 for i in `seq 1 $steps` do - ipsec statusall 2>&1 | grep ^[[:space:]]*$1: >/dev/null + $cmd 2>&1 | grep ^[[:space:]]*$1: >/dev/null [ $? -eq 0 ] && exit 0 sleep 0.1 done