diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-04-05 07:30:04 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-04-05 07:30:04 +0000 |
| commit | 55ff44b4efeab6741bc10778c7990d1e7cfbe51c (patch) | |
| tree | fbd56f0999860c7e425aa2db2039e49963c56230 /t_cltsrv.sh | |
| parent | 18597b93f7b43f63173f373fbd8548f2d08e25bb (diff) | |
| download | openvpn-55ff44b4efeab6741bc10778c7990d1e7cfbe51c.tar.gz openvpn-55ff44b4efeab6741bc10778c7990d1e7cfbe51c.tar.xz openvpn-55ff44b4efeab6741bc10778c7990d1e7cfbe51c.zip | |
svn merge -r 886:987 $SO/trunk/openvpn .
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@991 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 't_cltsrv.sh')
| -rwxr-xr-x | t_cltsrv.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/t_cltsrv.sh b/t_cltsrv.sh index 65c12ab..b72d1ee 100755 --- a/t_cltsrv.sh +++ b/t_cltsrv.sh @@ -1,7 +1,7 @@ #! /bin/sh # # t_cltsrv.sh - script to test OpenVPN's crypto loopback -# Copyright (C) 2005 Matthias Andree +# Copyright (C) 2005,2006 Matthias Andree # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -19,7 +19,6 @@ # 02110-1301, USA. set -e -echo "the following test will run about two minutes..." >&2 trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15 trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3 addopts= @@ -27,11 +26,19 @@ case `uname -s` in FreeBSD) # FreeBSD jails map the outgoing IP to the jail IP - we need to # allow the real IP unless we want the test to run forever. - if test `sysctl -n security.jail.jailed` != 0 ; then + if test "`sysctl 2>/dev/null -n security.jail.jailed`" = 1 \ + || ps -ostate= -p $$ | grep -q J; then addopts="--float" + if test "x`ifconfig | grep inet`" = x ; then + echo "###" + echo "### To run the test in a FreeBSD jail, you MUST add an IP alias for the jail's IP." + echo "###" + exit 1 + fi fi ;; esac +echo "the following test will take about two minutes..." >&2 set +e ( ./openvpn --cd "${srcdir}" ${addopts} --down 'echo "srv:${signal}" >&3 ; : #' --tls-exit --ping-exit 180 --config sample-config-files/loopback-server & |