mptcp/openmptcprouter-vps
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps.git synced 2025-03-09 15:50:00 +00:00
Code Issues Releases Wiki Activity

Force ip for omr6in4

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2018-07-03 08:10:51 +00:00
parent 5d3fe26a67
commit 50cb7c16d5
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian9-x86_64.sh
View file

@ -238,9 +238,9 @@ fi
# Add OpenMPTCProuter VPS script version to /etc/motd # Add OpenMPTCProuter VPS script version to /etc/motd
if grep --quiet 'OpenMPTCProuter VPS' /etc/motd; then if grep --quiet 'OpenMPTCProuter VPS' /etc/motd; then
sed -i 's:< OpenMPTCProuter VPS [0-9]*\.[0-9]* >:< OpenMPCTProuter VPS 0.32 >:' /etc/motd sed -i 's:< OpenMPTCProuter VPS [0-9]*\.[0-9]* >:< OpenMPCTProuter VPS 0.33 >:' /etc/motd
else else
echo '< OpenMPTCProuter VPS 0.32 >' >> /etc/motd echo '< OpenMPTCProuter VPS 0.33 >' >> /etc/motd
fi fi
if [ "$update" = "0" ]; then if [ "$update" = "0" ]; then

27
omr-6in4-service
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# OpenMPTCProuter VPS 6in4 service script # OpenMPTCProuter VPS 6in4 service script
if [ "$1" = "stop" ] && [ "$(ip link show omr-6in4 up)" ]; then if [ "$1" = "stop" ] && [ "$(ip link show omr-6in4 up 2>/dev/null)" ]; then
ip route del fd00::/8 via fe80::a00:2 dev omr-6in4 ip route del fd00::/8 via fe80::a00:2 dev omr-6in4
ip link set omr-6in4 down ip link set omr-6in4 down
ip tunnel del omr-6in4 ip tunnel del omr-6in4
@ -9,10 +9,11 @@ if [ "$1" = "stop" ] && [ "$(ip link show omr-6in4 up)" ]; then
fi fi
# Add IPv6 tunnel # Add IPv6 tunnel
if [ "$(ip link show omr-6in4 up)" ]; then if [ "$(ip link show omr-6in4 up 2>/dev/null)" ]; then
ip tunnel change omr-6in4 mode sit remote 10.255.255.2 local 10.255.255.1 ip tunnel change omr-6in4 mode sit remote 10.255.255.2 local 10.255.255.1
else else
ip tunnel add omr-6in4 mode sit remote 10.255.255.2 local 10.255.255.1 ip tunnel add omr-6in4 mode sit remote 10.255.255.2 local 10.255.255.1
ip addr add fe80::a00:1/64 dev omr-6in4 >/dev/null 2>&1
fi fi
ip link set omr-6in4 up ip link set omr-6in4 up
ip route replace fd00::/8 via fe80::a00:2 dev omr-6in4 ip route replace fd00::/8 via fe80::a00:2 dev omr-6in4
@ -49,16 +50,18 @@ $allip_mlvpn"
while IFS= read -r inet; do while IFS= read -r inet; do
ip=$(echo $inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n") ip=$(echo $inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")
ipd=$(echo $ip | sed 's/.1/.2/' | tr -d "\n") ipd=$(echo $ip | sed 's/.1/.2/' | tr -d "\n")
_ping $ipd if [ "$ipd" != "" ]; then
statusp=$? _ping $ipd
if $(exit $statusp); then statusp=$?
ip tunnel change omr-6in4 mode sit remote $ipd local $ip if $(exit $statusp); then
echo "VPS_ADDR=$ip" > /etc/shorewall/params.vpn ip tunnel change omr-6in4 mode sit remote $ipd local $ip
echo "OMR_ADDR=$ipd" >> /etc/shorewall/params.vpn echo "VPS_ADDR=$ip" > /etc/shorewall/params.vpn
iface=$(ip -4 addr | grep $ip | awk '{print $7}' | tr -d "\n") echo "OMR_ADDR=$ipd" >> /etc/shorewall/params.vpn
echo "VPS_IFACE=$iface" >> /etc/shorewall/params.vpn iface=$(ip -4 addr | grep $ip | awk '{print $7}' | tr -d "\n")
systemctl reload shorewall echo "VPS_IFACE=$iface" >> /etc/shorewall/params.vpn
break systemctl reload shorewall
break
fi
fi fi
done < <(printf '%s\n' "$allip") done < <(printf '%s\n' "$allip")
[ -z "$iface" ] && { [ -z "$iface" ] && {