From 4a64a33f2d5eb0579d3ec68592fa1b94abd9ea9e Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Sun, 2 Apr 2017 22:44:31 +0200 Subject: [PATCH] Better exit timing --- scripts/client-ping-server.sh | 2 +- scripts/server-execute.sh | 4 ++-- xiringuito | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/client-ping-server.sh b/scripts/client-ping-server.sh index 15d7f7b..5fcf88b 100755 --- a/scripts/client-ping-server.sh +++ b/scripts/client-ping-server.sh @@ -15,4 +15,4 @@ declare -r IP_BASE=${2} let SERVER_LAST_IP_ADDR_OCTET="4*(${TUNNEL_ID}-1)+2" declare -r SERVER_IP_ADDR=${IP_BASE}.${SERVER_LAST_IP_ADDR_OCTET} -ping -c3 -nq ${SERVER_IP_ADDR} >/dev/null +ping -c1 -nq ${SERVER_IP_ADDR} >/dev/null diff --git a/scripts/server-execute.sh b/scripts/server-execute.sh index 09ee3af..56705bc 100755 --- a/scripts/server-execute.sh +++ b/scripts/server-execute.sh @@ -26,7 +26,7 @@ function teardown() { echo "CONNECTED" FAILED_PINGS=0 -while [[ ${FAILED_PINGS} -lt 5 ]]; do +while [[ ${FAILED_PINGS} -lt 20 ]]; do ping -c3 -nq ${CLIENT_IP_ADDR} >/dev/null if [[ ${?} -ne 0 ]]; then let FAILED_PINGS+=1 @@ -35,7 +35,7 @@ while [[ ${FAILED_PINGS} -lt 5 ]]; do FAILED_PINGS=0 fi - sleep 5 + sleep 1 done teardown diff --git a/xiringuito b/xiringuito index 4ac6c1d..150d4c7 100755 --- a/xiringuito +++ b/xiringuito @@ -121,7 +121,7 @@ fi set +e FAILED_PINGS=0 -while [[ ${FAILED_PINGS} -lt 5 ]]; do +while [[ ${FAILED_PINGS} -lt 20 ]]; do kill -0 ${SSH_PID} &>/dev/null || exit 17 ./scripts/client-ping-server.sh ${TUNNEL_ID} ${IP_BASE} @@ -132,7 +132,7 @@ while [[ ${FAILED_PINGS} -lt 5 ]]; do FAILED_PINGS=0 fi - sleep 5 + sleep 1 done teardown