1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-13 02:51:50 +00:00

Fix MPTCPoverVPN

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-01-20 21:03:31 +01:00
parent 12cd07c280
commit b23693017e

View file

@ -61,9 +61,9 @@ mptcp_over_vpn() {
commit openmptcprouter
EOF
fi
elif [ "$(uci -q get openmptcprouter.opvn${interface})" != "" ]; then
elif [ "$(uci -q get openmptcprouter.ovpn${interface})" != "" ]; then
logger -t "MPTCPoverVPN" "Disable MPTCP over VPN for ${interface}"
multipath=$(uci -q get openmptcprouter.opvn${interface}.multipath)
multipath=$(uci -q get openmptcprouter.ovpn${interface}.multipath)
[ -z "$multipath" ] && multipath="on"
uci -q batch <<-EOF >/dev/null
delete network.ovpn${interface}
@ -72,6 +72,7 @@ mptcp_over_vpn() {
commit openvpn
set openmptcprouter.${interface}.multipath="${multipath}"
set openmptcprouter.${interface}.multipathvpn="0"
delete openmptcprouter.ovpn${interface}
commit openmptcprouter
EOF
fi
@ -97,13 +98,14 @@ start_service()
fi
NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n")
if [ "$nbintfvpn" != 0 ]; then
for c in $(seq 2 $NBCPU); do
uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.mptcpovervpn=server
set shadowsocks-libev.mptcpovervpn.server_port="$(uci -q get shadowsocks-libev.sss0.server_port)"
set shadowsocks-libev.mptcpovervpn.key="$(uci -q get shadowsocks-libev.sss0.key)"
set shadowsocks-libev.mptcpovervpn.method="$(uci -q get shadowsocks-libev.sss0.method)"
set shadowsocks-libev.mptcpovervpn.server="10.255.250.1"
EOF
for c in $(seq 2 $NBCPU); do
set shadowsocks-libev.hivpn$c=ss_redir
set shadowsocks-libev.hivpn$c.server="mptcpovervpn"
set shadowsocks-libev.hivpn$c.local_address='0.0.0.0'
@ -122,7 +124,7 @@ start_service()
uci -q batch <<-EOF >/dev/null
commit shadowsocks-libev
EOF
elif [ "$(shadowsocks-libev.hivpn1)" != "" ]; then
elif [ "$(uci -q get shadowsocks-libev.hivpn1)" != "" ]; then
for c in $(seq 2 $NBCPU); do
uci -q batch <<-EOF >/dev/null
delete shadowsocks-libev.hivpn$c
@ -132,6 +134,7 @@ start_service()
delete shadowsocks-libev.sss0.disabled
EOF
uci -q batch <<-EOF >/dev/null
delete shadowsocks-libev.mptcpovervpn
commit shadowsocks-libev
EOF
fi