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

fix

Browse source
This commit is contained in:
suyuan 2023-08-21 02:49:35 +08:00
parent d4ed20af96
commit daa43369e1
151 changed files with 3144 additions and 12804 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,6 +107,7 @@ _set_json() {
_set_glorytun_vps() {
local enabled port key
enabled="$(uci -q get glorytun.vpn.enable)"
[ "$enabled" != "1" ] && enabled="$(uci -q get glorytun-udp.vpn.enable)"
[ "$enabled" != "1" ] && echo "Glorytun disabled" && return
port="$(uci -q get glorytun.vpn.port)"
key="$(uci -q get glorytun.vpn.key)"
@ -1360,8 +1361,8 @@ _set_config_from_vps() {
fi
# Shadowsocks settings
shadowsocks_disabled="$(uci -q get openmptcprouter.settings.shadowsocks_disable)"
[ -z "$shadowsocks_disabled" ] && shadowsocks_disabled=0
#shadowsocks_disabled="$(uci -q get openmptcprouter.settings.shadowsocks_disable)"
#[ -z "$shadowsocks_disabled" ] && shadowsocks_disabled=0
ss_key="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.key')"
ss_key="$(echo $ss_key | sed 's/-/+/g; s/_/\//g;')"
if [ -n "$ss_key" ] && [ "$ss_key" != "$(uci -q get shadowsocks-libev.sss0.key)" ]; then
@ -1397,7 +1398,6 @@ _set_config_from_vps() {
set shadowsocks-libev.sss0.key=$ss_key
set shadowsocks-libev.sss0.server_port=$ss_port
set shadowsocks-libev.sss0.method=$ss_method
set shadowsocks-libev.sss0.disabled=$shadowsocks_disabled
set shadowsocks-libev.sss0.obfs=$ss_obfs
set shadowsocks-libev.sss0.obfs_plugin=$ss_obfs_plugin
set shadowsocks-libev.sss0.obfs_type=$ss_obfs_type
@ -1910,17 +1910,16 @@ _config_service() {
[ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] && {
_get_vps_config
}
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')"
if [ "$(uci -q get openmptcprouter.settings.firstboot)" != "0" ]; then
[ -n "$vps_config" ] && [ -n "$(cat /proc/cpuinfo | grep aes)" ] && {
[ -n "$(cat /proc/cpuinfo | grep aes)" ] && {
vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')"
if [ "$vps_aes" != "false" ] && [ "$user_permission" != "ro" ]; then
logger -t "OMR-VPS" "CPU support AES, set it by default"
method="$(uci -q get shadowsocks-libev.sss0.method)"
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.encryption="aes-256-gcm"
commit openmptcprouter
set glorytun.vpn.chacha20="0"
commit glorytun
set glorytun-udp.vpn.chacha="0"
@ -1935,6 +1934,11 @@ _config_service() {
fi
}
fi
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')"
if [ "$user_permission" != "ro" ]; then
#config_load shadowsocks-libev
#config_foreach _set_ss_server_vps server