v/xiringuito
1
0
Fork 0
mirror of https://github.com/ivanilves/xiringuito.git synced 2025-05-20 09:10:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Better exit timing

Browse Source
This commit is contained in:
Ivan Ilves 2017-04-02 22:44:31 +02:00
parent fcaf6c2a61
commit 4a64a33f2d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/client-ping-server.sh
View File

@ -15,4 +15,4 @@ declare -r IP_BASE=${2}
let SERVER_LAST_IP_ADDR_OCTET="4*(${TUNNEL_ID}-1)+2" let SERVER_LAST_IP_ADDR_OCTET="4*(${TUNNEL_ID}-1)+2"
declare -r SERVER_IP_ADDR=${IP_BASE}.${SERVER_LAST_IP_ADDR_OCTET} 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

4
scripts/server-execute.sh
View File

@ -26,7 +26,7 @@ function teardown() {
echo "CONNECTED" echo "CONNECTED"
FAILED_PINGS=0 FAILED_PINGS=0
while [[ ${FAILED_PINGS} -lt 5 ]]; do while [[ ${FAILED_PINGS} -lt 20 ]]; do
ping -c3 -nq ${CLIENT_IP_ADDR} >/dev/null ping -c3 -nq ${CLIENT_IP_ADDR} >/dev/null
if [[ ${?} -ne 0 ]]; then if [[ ${?} -ne 0 ]]; then
let FAILED_PINGS+=1 let FAILED_PINGS+=1
@ -35,7 +35,7 @@ while [[ ${FAILED_PINGS} -lt 5 ]]; do
FAILED_PINGS=0 FAILED_PINGS=0
fi fi
sleep 5 sleep 1
done done
teardown teardown

4
xiringuito
View File

@ -121,7 +121,7 @@ fi
set +e set +e
FAILED_PINGS=0 FAILED_PINGS=0
while [[ ${FAILED_PINGS} -lt 5 ]]; do while [[ ${FAILED_PINGS} -lt 20 ]]; do
kill -0 ${SSH_PID} &>/dev/null || exit 17 kill -0 ${SSH_PID} &>/dev/null || exit 17
./scripts/client-ping-server.sh ${TUNNEL_ID} ${IP_BASE} ./scripts/client-ping-server.sh ${TUNNEL_ID} ${IP_BASE}
@ -132,7 +132,7 @@ while [[ ${FAILED_PINGS} -lt 5 ]]; do
FAILED_PINGS=0 FAILED_PINGS=0
fi fi
sleep 5 sleep 1
done done
teardown teardown