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

Faster xiringuito connect

Browse Source
This commit is contained in:
Ivan Ilves 2017-07-07 18:30:44 +02:00
parent b538d59797
commit 40f49b5791
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/wait_for
View File

@ -28,7 +28,7 @@ declare -r COMMAND="${@}"
WAIT_TIME=0 WAIT_TIME=0
while [[ ${WAIT_TIME} -lt ${TIMEOUT} ]]; do while [[ ${WAIT_TIME} -lt ${TIMEOUT} ]]; do
${COMMAND} ${COMMAND} &>/dev/null
RETVAL=${?} RETVAL=${?}
if [[ "${RESOLUTION}" == "true" ]]; then if [[ "${RESOLUTION}" == "true" ]]; then

2
scripts/server-execute.sh
View File

@ -28,8 +28,6 @@ function teardown() {
[[ ! -x /usr/sbin/tunctl ]] && sudo ip tuntap del mode tun ${NETWORK_DEVICE} || sudo /usr/sbin/tunctl -d ${NETWORK_DEVICE} [[ ! -x /usr/sbin/tunctl ]] && sudo ip tuntap del mode tun ${NETWORK_DEVICE} || sudo /usr/sbin/tunctl -d ${NETWORK_DEVICE}
} }
echo "CONNECTED"
FAILED_PINGS=0 FAILED_PINGS=0
while [[ ${FAILED_PINGS} -lt ${MAX_FAILED_PINGS} ]]; do while [[ ${FAILED_PINGS} -lt ${MAX_FAILED_PINGS} ]]; do
ping -W3 -c1 -nq ${CLIENT_IP_ADDR} >/dev/null ping -W3 -c1 -nq ${CLIENT_IP_ADDR} >/dev/null

10
xiringuito
View File

@ -2,7 +2,10 @@
# #
# Obscene SSH-based VPN for poors ;) # Obscene SSH-based VPN for poors ;)
# #
set -e set -eo pipefail
export PATH="${PATH}:$(dirname ${0})/helpers"
export WAIT_VERBOSE=true
function print_help() { function print_help() {
echo "Usage: ${0} [OPTIONS] [SSH_USER@]SSH_SERVER [NETWORK1, NETWORK2, ... NETWORKx]" echo "Usage: ${0} [OPTIONS] [SSH_USER@]SSH_SERVER [NETWORK1, NETWORK2, ... NETWORKx]"
@ -153,7 +156,7 @@ 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} ssh ${SSH_OPTS} ${SSH_SERVER} ${REMOTE_PATH}/server-setup.sh ${TUNNEL_ID} ${IP_BASE}
sleep 1; echo -n "SERVER: ${SSH_SERVER} ... " sleep 1; echo "SERVER: ${SSH_SERVER}"
set +e set +e
ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh &>/dev/null ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh &>/dev/null
set -e set -e
@ -166,7 +169,7 @@ ${SSH_TUNNEL_CMD} ${SSH_OPTS} -oStrictHostKeyChecking=no -w ${LOCAL_TUNNEL_ID}:$
SSH_PID=${!} SSH_PID=${!}
sudo -E ./scripts/${KERNEL}/client-teardown.sh ${$} ${SSH_PID} ${LOCAL_TUNNEL_ID} & sudo -E ./scripts/${KERNEL}/client-teardown.sh ${$} ${SSH_PID} ${LOCAL_TUNNEL_ID} &
sleep 5 wait_for true 5 ip link show dev tun${LOCAL_TUNNEL_ID}
if [[ ${KERNEL} == darwin ]]; then if [[ ${KERNEL} == darwin ]]; then
./scripts/${KERNEL}/client-setup.sh ${TUNNEL_ID} ${LOCAL_TUNNEL_ID} ${IP_BASE} ./scripts/${KERNEL}/client-setup.sh ${TUNNEL_ID} ${LOCAL_TUNNEL_ID} ${IP_BASE}
@ -220,5 +223,6 @@ done
teardown teardown
if [[ -z "${NO_RECONNECT}" ]]; then if [[ -z "${NO_RECONNECT}" ]]; then
wait_for false 10 ip link show dev tun${LOCAL_TUNNEL_ID}
exec ${ORIGINAL_EXEC} -r ${ORIGINAL_ARGS} exec ${ORIGINAL_EXEC} -r ${ORIGINAL_ARGS}
fi fi