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

Merge pull request #28 from ivanilves/fix/legacy-server-support

Browse Source 
Legacy server support
This commit is contained in:
Ivan Ilves 2017-04-24 22:11:49 +02:00 committed by GitHub
commit 00964dc28d
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/server-execute.sh
View File

@ -25,7 +25,7 @@ function teardown() {
sudo iptables -t nat -D POSTROUTING -s ${CLIENT_IP_ADDR} -j MASQUERADE sudo iptables -t nat -D POSTROUTING -s ${CLIENT_IP_ADDR} -j MASQUERADE
kill ${PPID} kill ${PPID}
sleep 2 sleep 2
sudo ip tuntap del mode tun ${NETWORK_DEVICE} [[ ! -x /usr/sbin/tunctl ]] && sudo ip tuntap del mode tun ${NETWORK_DEVICE} || sudo /usr/sbin/tunctl -d ${NETWORK_DEVICE}
} }
echo "CONNECTED" echo "CONNECTED"

20
scripts/server-setup.sh
View File

@ -38,19 +38,33 @@ fi
set +e set +e
pkill -f ${TUNNEL_ID}/server-execute.sh pkill -f ${TUNNEL_ID}/server-execute.sh
if [[ ${?} -eq 0 ]]; then sleep 2; fi if [[ ${?} -eq 0 ]]; then sleep 2; fi
sudo ip tuntap del mode tun ${NETWORK_DEVICE} [[ ! -x /usr/sbin/tunctl ]] && sudo ip tuntap del mode tun ${NETWORK_DEVICE} || sudo /usr/sbin/tunctl -d ${NETWORK_DEVICE}
set -e set -e
# Set up network device # Set up network device
if [[ ! $(sudo ip link | grep " ${NETWORK_DEVICE}: ") ]]; then if [[ ! $(sudo ip link | grep " ${NETWORK_DEVICE}: ") ]]; then
sudo modprobe tun sudo modprobe tun
sudo ip tuntap add mode tun user ${USER} ${NETWORK_DEVICE}
if [[ ! -x /usr/sbin/tunctl ]]; then
set +e
sudo ip tuntap add mode tun user ${USER} ${NETWORK_DEVICE}
if [[ ${?} -ne 0 ]]; then
echo "NB! Failed to add tunX device on the server side!"
echo "NB! Either you have old or not operational 'iproute2' package installed. :-|"
echo "NB! If you run old distribution, maybe you need to install 'tunctl' package."
exit 39
fi
set -e
else
sudo /usr/sbin/tunctl -u ${USER} -t ${NETWORK_DEVICE}
fi
sudo ip link set ${NETWORK_DEVICE} up sudo ip link set ${NETWORK_DEVICE} up
sudo ip addr add ${SERVER_IP_ADDR}/32 peer ${CLIENT_IP_ADDR} dev ${NETWORK_DEVICE} sudo ip addr add ${SERVER_IP_ADDR}/32 peer ${CLIENT_IP_ADDR} dev ${NETWORK_DEVICE}
fi fi
# Set up SSH server for tunneling # Set up SSH server for tunneling
if [[ ! $(grep "^PermitTunnel yes" ${SSHD_CONFIG_FILE}) ]]; then if [[ ! $(sudo grep "^PermitTunnel yes" ${SSHD_CONFIG_FILE}) ]]; then
echo "PermitTunnel yes" | sudo tee -a ${SSHD_CONFIG_FILE} echo "PermitTunnel yes" | sudo tee -a ${SSHD_CONFIG_FILE}
sudo ${SSHD_RESTART_CMD} sudo ${SSHD_RESTART_CMD}
fi fi

1
xiringuito
View File

@ -36,6 +36,7 @@ if [[ ${#} -lt 1 ]]; then
fi fi
# We need to save executable path and arguments for reconnection functionality # We need to save executable path and arguments for reconnection functionality
export PATH="${PATH}:."
declare -r ORIGINAL_EXEC=${0} declare -r ORIGINAL_EXEC=${0}
declare -r ORIGINAL_ARGS=${@} declare -r ORIGINAL_ARGS=${@}