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

Merge branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2021-01-30 01:12:27 +08:00
commit 510a9df2d7
15 changed files with 192 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openmptcprouter/files/etc/init.d/mptcpovervpn
View file

@ -9,7 +9,7 @@
}
_getremoteip() {
[ "$(uci -q get openmptcprouter.$1.master)" = "1" ] && remoteip=$(uci -q get openmptcprouter.$1.ip)
[ "$(uci -q get openmptcprouter.$1.master)" = "1" ] && remoteip=$(uci -q get openmptcprouter.$1.ip | awk '{print $1}')
}
mptcp_over_vpn() {
@ -139,8 +139,8 @@ start_service()
elif [ "$(uci -q get glorytun.vpn.host)" = "10.255.250.1" ] && [ "$nbintf" != "$nbintfvpn" ]; then
uci -q batch <<-EOF >/dev/null
delete shadowsocks-libev.sss0.disabled
set glorytun.vpn.host="$(uci -q get openmptcprouter.vps.ip)"
set glorytun-udp.vpn.host="$(uci -q get openmptcprouter.vps.ip)"
set glorytun.vpn.host="$(uci -q get openmptcprouter.vps.ip | awk '{print $1}')"
set glorytun-udp.vpn.host="$(uci -q get openmptcprouter.vps.ip | awk '{print $1}')"
commit glorytun
commit glorytun-udp
EOF

9
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -362,10 +362,11 @@ _get_vps_config() {
fi
fi
fi
vpsip="$(uci -q get openmptcprouter.${servername}.ip)"
vpsip="$(uci -q get openmptcprouter.${servername}.ip | awk '{print $1}')"
if [ "$(uci -q get shadowsocks-libev.sss0.server)" != "127.0.0.1" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
config_foreach _set_ss_server server "server" $vpsip
uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.sss0.server="$vpsip"
commit shadowsocks-libev
EOF
if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" = "0" ]; then
@ -1033,7 +1034,9 @@ _set_ss_server() {
elif [ "$value" = "false" ]; then
value=0
fi
[ "$(echo $1 | grep omr)" != "" ] && uci -q set shadowsocks-libev.$1.$option=$value
if [ "$(echo $1 | grep omr)" != "" ] || [ "$(echo $1 | grep sss)" ]; then
uci -q set shadowsocks-libev.$1.$option=$value
fi
}
_set_config_from_vps() {
@ -1044,7 +1047,7 @@ _set_config_from_vps() {
logger -t "OMR-VPS" "Get config from server ${servername}..."
noerror=1
# get VPS ip
vpsip="$(uci -q get openmptcprouter.${servername}.ip)"
vpsip="$(uci -q get openmptcprouter.${servername}.ip | awk '{print $1}')"
vps_lastchange="$(echo "$vps_config" | jsonfilter -q -e '@.vps.lastchange')"
lastchange="$(uci -q get openmptcprouter.${servername}.lastchange)"
[ -z "$lastchange" ] && lastchange=0

2
openmptcprouter/files/etc/init.d/openvpnbonding
View file

@ -9,7 +9,7 @@
}
_getremoteip() {
[ "$(uci -q get openmptcprouter.$1.master)" = "1" ] && remoteip=$(uci -q get openmptcprouter.$1.ip)
[ "$(uci -q get openmptcprouter.$1.master)" = "1" ] && remoteip=$(uci -q get openmptcprouter.$1.ip | awk '{print $1}')
}
_openvpnbonding() {