From: Samuli Seppänen Date: Tue, 8 Nov 2016 13:50:43 +0000 (+0200) Subject: Allow passing extra arguments to fping/fping6 in t_client.rc X-Git-Tag: v2.4_beta1~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f17e18be0d6ab801704400abcc6b17d4fed9650;p=thirdparty%2Fopenvpn.git Allow passing extra arguments to fping/fping6 in t_client.rc This can be useful, for example, in preventing fping failures caused by external network issues. v2: - Allow override of the default parameters Signed-off-by: Samuli Seppänen Acked-by: Gert Doering Message-Id: <1478613043-27033-1-git-send-email-samuli@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg12962.html Signed-off-by: Gert Doering --- diff --git a/tests/t_client.rc-sample b/tests/t_client.rc-sample index 31dfafac0..4fdea4876 100644 --- a/tests/t_client.rc-sample +++ b/tests/t_client.rc-sample @@ -11,6 +11,7 @@ top_srcdir="${top_srcdir:-..}" CA_CERT="${top_srcdir}/sample/sample-keys/ca.crt" CLIENT_KEY="${top_srcdir}/sample/sample-keys/client.key" CLIENT_CERT="${top_srcdir}/sample/sample-keys/client.crt" +#FPING_EXTRA_ARGS="-t 1000" # Load EXPECT_IFCONFIG* parameters from cache if [ -r "${top_builddir}/t_client_ips.rc" ]; then diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in index 408703ee5..076f6bd86 100755 --- a/tests/t_client.sh.in +++ b/tests/t_client.sh.in @@ -231,8 +231,8 @@ run_ping_tests() do echo "run IPv$proto ping tests ($want), $bytes byte packets..." - echo "$cmd -b $bytes -C 20 -p 250 -q $targetlist" >>$LOGDIR/$SUF:fping.out - $cmd -b $bytes -C 20 -p 250 -q $targetlist >>$LOGDIR/$SUF:fping.out 2>&1 + echo "$cmd -b $bytes -C 20 -p 250 -q $FPING_EXTRA_ARGS $targetlist" >>$LOGDIR/$SUF:fping.out + $cmd -b $bytes -C 20 -p 250 -q $FPING_EXTRA_ARGS $targetlist >>$LOGDIR/$SUF:fping.out 2>&1 # while OpenVPN is running, pings must succeed (want='want_ok') # before OpenVPN is up, pings must NOT succeed (want='want_fail')