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

Remove ugly "post connect" hack

Browse Source
This commit is contained in:
Ivan Ilves 2017-04-02 17:56:03 +02:00
parent 11c09aeba4
commit 46e7959ffb
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/darwin/client-teardown.sh
View File

@ -23,7 +23,7 @@ if [[ -f /etc/resolv.conf.orig ]]; then
fi fi
if [[ ${SSH_PID} -ne 0 ]]; then if [[ ${SSH_PID} -ne 0 ]]; then
kill ${SSH_PID}; sleep 1 kill ${SSH_PID} &>/dev/null; sleep 1
fi fi
NETWORK_SERVICE="$($(dirname ${0})/get-network-service-name.sh)" NETWORK_SERVICE="$($(dirname ${0})/get-network-service-name.sh)"

2
scripts/linux/client-teardown.sh
View File

@ -23,7 +23,7 @@ if [[ -f /etc/resolv.conf.orig ]]; then
fi fi
if [[ ${SSH_PID} -ne 0 ]]; then if [[ ${SSH_PID} -ne 0 ]]; then
kill ${SSH_PID}; sleep 1 kill ${SSH_PID} &>/dev/null; sleep 1
fi fi
ip tuntap del mode tun tun${TUNNEL_ID} ip tuntap del mode tun tun${TUNNEL_ID}

4
xiringuito
View File

@ -62,9 +62,7 @@ trap 'exit 130' INT
trap teardown EXIT trap teardown EXIT
function teardown() { function teardown() {
if [[ ${SSH_PID} ]]; then if [[ ! ${SSH_PID} ]]; then
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} sudo ./scripts/${KERNEL}/client-teardown.sh ${$} 0 ${LOCAL_TUNNEL_ID}
fi fi
} }