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-03-19 12:17:35 +08:00
commit b2b977bb86
20 changed files with 156 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

11
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -583,10 +583,15 @@ function wizard_add()
if default_proxy == "shadowsocks" and serversnb > disablednb then
ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","0")
end
nbip = nbip + 1
if disableipv6 == "1" and nbip > 0 then
ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","1")
break
end
nbip = nbip + 1
end
if nbip == 1 then
--ucic:set("shadowsocks-libev","sss" .. nbip,"server",server_ip)
ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","1")
end
end
k = k + 1
@ -621,6 +626,10 @@ function wizard_add()
break
end
end
if nbip == 1 then
-- ucic:set("shadowsocks-libev","sss" .. nbip,"server",server_ip)
ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","1")
end
end
end
end

9
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -62,7 +62,8 @@ omr_set_settings() {
config_get type "$1" type
config_get ipv6 "$1" ipv6
config_get addlatency "$1" addlatency
[ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "omrvpn" ] && [ "$1" != "glorytun" ] && return
[ -z "$multipath" ] || [ "$multipath" = "off" ] && return
[ "$1" = "omrvpn" ] || [ "$1" = "glorytun" ] && return
uci -q set openmptcprouter.$1=interface
uci -q set openmptcprouter.$1.multipath="$multipath"
@ -86,13 +87,13 @@ omr_set_settings() {
fi
if [ "$addlatency" = "0" ] && [ "$(tc qdisc show dev $ifname | grep delay)" != "" ]; then
tc qdisc del dev ${ifname} root netem
tc qdisc del dev ${ifname} root netem 2>&1 >/dev/null
fi
if [ "$addlatency" != "0" ]; then
if [ "$(tc qdisc show dev $ifname | grep delay)" != "" ]; then
tc qdisc add dev ${ifname} root netem delay ${addlatency}ms
tc qdisc add dev ${ifname} root netem delay ${addlatency}ms 2>&1 >/dev/null
elif [ "$(tc qdisc show dev $ifname | awk '/delay/ { print $10 }' | sed 's/ms//')" != "$addlatency" ]; then
tc qdisc replace dev ${ifname} root netem delay ${addlatency}ms
tc qdisc replace dev ${ifname} root netem delay ${addlatency}ms 2>&1 >/dev/null
fi
fi
fi