v/xiringuito
1
0
Fork 0
mirror of https://github.com/ivanilves/xiringuito.git synced 2025-06-01 23:10:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Support legacy servers (???)

Browse Source
This commit is contained in:
Ivan Ilves 2017-04-24 15:47:28 +02:00
parent 0d0669c335
commit eb5ad1e2af
2 changed files with 7 additions and 3 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} sudo ip tuntap del mode tun ${NETWORK_DEVICE} || sudo /usr/sbin/tunctl -d ${NETWORK_DEVICE}
} }
echo "CONNECTED" echo "CONNECTED"

8
scripts/server-setup.sh
View File

@ -38,13 +38,17 @@ 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} 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}
set +e
sudo ip tuntap add mode tun user ${USER} ${NETWORK_DEVICE} || sudo /usr/sbin/tunctl -u ${USER} -t ${NETWORK_DEVICE}
set -e
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