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

Some reliability cowboy-fixes

Browse Source
This commit is contained in:
Ivan Ilves 2017-02-20 09:02:50 +01:00
parent 4a623a5c86
commit 52989fc020
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/server-execute.sh
View File

@ -20,6 +20,7 @@ trap teardown EXIT
function teardown() {
sudo iptables -t nat -D POSTROUTING -s ${CLIENT_IP_ADDR} -j MASQUERADE
kill ${PPID}
sleep 2
sudo ip tuntap del mode tun ${NETWORK_DEVICE}
}

11
xiringuito
View File

@ -61,7 +61,7 @@ trap teardown EXIT
function teardown() {
if [[ ${SSH_PID} ]]; then
ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh
ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh &>/dev/null &
else
sudo ./scripts/${KERNEL}/client-teardown.sh ${$} 0 ${LOCAL_TUNNEL_ID}
fi
@ -79,6 +79,9 @@ scp ${SSH_OPTS} ./scripts/server-*.sh ${SSH_SERVER}:${REMOTE_PATH} >/dev/null
ssh ${SSH_OPTS} ${SSH_SERVER} ${REMOTE_PATH}/server-setup.sh ${TUNNEL_ID} ${IP_BASE}
sleep 1; echo -n "SERVER: ${SSH_SERVER} ... "
set +e
ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh &>/dev/null
set -e
if [[ ${KERNEL} == linux ]]; then
SSH_TUNNEL_CMD="ssh"
else
@ -88,11 +91,7 @@ ${SSH_TUNNEL_CMD} ${SSH_OPTS} -oStrictHostKeyChecking=no -w ${LOCAL_TUNNEL_ID}:$
SSH_PID=${!}
sudo ./scripts/${KERNEL}/client-teardown.sh ${$} ${SSH_PID} ${LOCAL_TUNNEL_ID} &
if [[ ${KERNEL} == linux ]]; then
sleep 3
else
sleep 5 # slow bitch!
fi
sleep 5
if [[ ${KERNEL} == darwin ]]; then
./scripts/${KERNEL}/client-setup.sh ${TUNNEL_ID} ${LOCAL_TUNNEL_ID} ${IP_BASE}