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

Finite reconnects from client/server sides

Browse Source
This commit is contained in:
Ivan Ilves 2017-04-02 18:01:29 +02:00
parent 46e7959ffb
commit 1c9117892e
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/server-execute.sh
View File

@ -2,8 +2,6 @@
# #
# Execute/teardown on the server side # Execute/teardown on the server side
# #
set -e
if [[ ${#} != 2 ]]; then if [[ ${#} != 2 ]]; then
echo "Usage: ${0} TUNNEL_ID IP_BASE" echo "Usage: ${0} TUNNEL_ID IP_BASE"
exit 1 exit 1
@ -26,6 +24,18 @@ function teardown() {
} }
echo "CONNECTED" echo "CONNECTED"
while true; do
sleep 60000 # TODO: Maybe we need some heartbeat here FAILED_PINGS=0
while [[ ${FAILED_PINGS} -lt 5 ]]; do
ping -c3 -nq ${CLIENT_IP_ADDR} >/dev/null
if [[ ${?} -ne 0 ]]; then
let FAILED_PINGS+=1
logger -i -p warn "xiringuito[${TUNNEL_ID}]: Failed to ping ${CLIENT_IP_ADDR} (${FAILED_PINGS})"
else
FAILED_PINGS=0
fi
sleep 5
done done
teardown

18
xiringuito
View File

@ -50,7 +50,7 @@ fi
declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE}) declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE})
declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}" declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}"
declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectTimeout=10" declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=10"
if [[ ${KERNEL} == linux ]]; then if [[ ${KERNEL} == linux ]]; then
declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID} declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID}
@ -120,13 +120,17 @@ if [[ ! ${NO_DNS} && ! -z "${NETWORKS}" ]]; then
fi fi
set +e set +e
while true; do FAILED_PINGS=0
if [[ ! ${NO_PING} ]]; then while [[ ${FAILED_PINGS} -lt 5 ]]; do
./scripts/client-ping-server.sh ${TUNNEL_ID} ${IP_BASE} ./scripts/client-ping-server.sh ${TUNNEL_ID} ${IP_BASE}
if [[ ${?} -ne 0 ]]; then if [[ ${?} -ne 0 ]]; then
echo "* Failed to ping server-side tunnel endpoint..." let FAILED_PINGS+=1
fi echo "* Failed to ping server-side tunnel endpoint... (${FAILED_PINGS})"
else
FAILED_PINGS=0
fi fi
sleep 5 sleep 5
done done
teardown