mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Merge branch 'test' into develop
This commit is contained in:
commit
1fe1b285ba
45 changed files with 3444 additions and 1961 deletions
|
@ -3,11 +3,19 @@
|
|||
# Released under GPL 3. See LICENSE for the full terms.
|
||||
|
||||
{
|
||||
START=70
|
||||
START=99
|
||||
STOP=10
|
||||
USE_PROCD=1
|
||||
}
|
||||
|
||||
wireguard_restart() {
|
||||
local interface=$1
|
||||
if [ "$(uci -q get network.${interface}.proto)" = "wireguard" ] && [ -n "$(uci -q get network.${interface}.fwmark)" ]; then
|
||||
ifdown ${interface}
|
||||
ifup ${interface}
|
||||
fi
|
||||
}
|
||||
|
||||
_getremoteip() {
|
||||
[ "$(uci -q get openmptcprouter.$1.master)" = "1" ] && {
|
||||
remoteip=$(uci -q get openmptcprouter.$1.ip | awk '{print $1}')
|
||||
|
@ -211,14 +219,24 @@ start_service()
|
|||
config_load openmptcprouter
|
||||
config_foreach mptcp_over_vpn interface
|
||||
if [ "$nbintf" = "$nbintfvpn" ] && [ "$nbintf" != "0" ]; then
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set shadowsocks-libev.sss0.disabled='1'
|
||||
set glorytun.vpn.host='10.255.250.1'
|
||||
set glorytun-udp.vpn.host='10.255.250.1'
|
||||
commit glorytun
|
||||
commit glorytun-udp
|
||||
EOF
|
||||
elif [ "$(uci -q get glorytun.vpn.host)" = "10.255.250.1" ] && [ "$nbintf" != "$nbintfvpn" ]; then
|
||||
if [ "$vpn" = "openvpn" ]; then
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set shadowsocks-libev.sss0.disabled='1'
|
||||
set glorytun.vpn.host='10.255.250.1'
|
||||
set glorytun-udp.vpn.host='10.255.250.1'
|
||||
commit glorytun
|
||||
commit glorytun-udp
|
||||
EOF
|
||||
else
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set shadowsocks-libev.sss0.disabled='1'
|
||||
set glorytun.vpn.host='10.255.247.1'
|
||||
set glorytun-udp.vpn.host='10.255.247.1'
|
||||
commit glorytun
|
||||
commit glorytun-udp
|
||||
EOF
|
||||
fi
|
||||
elif ([ "$(uci -q get glorytun.vpn.host)" = "10.255.250.1" ] || [ "$(uci -q get glorytun.vpn.host)" = "10.255.247.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 | awk '{print $1}')"
|
||||
|
@ -229,14 +247,25 @@ start_service()
|
|||
fi
|
||||
NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n")
|
||||
if [ "$nbintfvpn" != 0 ]; then
|
||||
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"
|
||||
delete shadowsocks-libev.mptcpovervpn.disabled
|
||||
EOF
|
||||
if [ "$vpn" = "openvpn" ]; then
|
||||
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"
|
||||
delete shadowsocks-libev.mptcpovervpn.disabled
|
||||
EOF
|
||||
else
|
||||
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.247.1"
|
||||
delete shadowsocks-libev.mptcpovervpn.disabled
|
||||
EOF
|
||||
fi
|
||||
for c in $(seq 1 $NBCPU); do
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set shadowsocks-libev.hivpn$c=ss_redir
|
||||
|
@ -271,6 +300,16 @@ start_service()
|
|||
commit shadowsocks-libev
|
||||
EOF
|
||||
fi
|
||||
if [ "$BOOT" = "1" ]; then
|
||||
config_load network
|
||||
config_foreach wireguard_restart interface
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
boot() {
|
||||
BOOT=1
|
||||
start
|
||||
}
|
||||
|
||||
service_triggers() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue