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 <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <gert@greenie.muc.de>

diff --git a/tests/t_client.rc-sample b/tests/t_client.rc-sample
index 31dfafac02b30d7145ee06a5a9eb329835be5a45..4fdea4876580c0fd8f8313674d9346aff25a5195 100644 (file)
--- 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 408703ee5f5288b3a0e52e75e98eb4d03de3d3e3..076f6bd86e7175118c9a9ac7028e9c0bc2fbdbac 100755 (executable)
--- 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')