mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Fix Shadowsocks-go and lanips check in OpenMPTCProuter-vps script
This commit is contained in:
parent
4f0139e9e9
commit
2f62cd9226
1 changed files with 10 additions and 12 deletions
|
@ -313,26 +313,24 @@ _set_ssgo_server_vps() {
|
||||||
local current_port current_key current_method
|
local current_port current_key current_method
|
||||||
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
|
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
|
||||||
[ -z "$vps_config" ] && return
|
[ -z "$vps_config" ] && return
|
||||||
current_port="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks-go.port')"
|
current_port="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks_go.config.port')"
|
||||||
current_key="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks-go.key')"
|
current_key="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks_go.config.password')"
|
||||||
current_method="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks-go.method')"
|
current_method="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks_go.config.protocol')"
|
||||||
current_fast_open="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks-go.fast_open')"
|
# current_fast_open="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks_go.config.fast_open')"
|
||||||
current_mptcp="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks-go.mptcp')"
|
# current_mptcp="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks_go.config.mptcp')"
|
||||||
|
|
||||||
ebpf="false"
|
ebpf="false"
|
||||||
fast_open="false"
|
fast_open="false"
|
||||||
no_delay="false"
|
no_delay="false"
|
||||||
mptcp="false"
|
mptcp="false"
|
||||||
obfs="false"
|
|
||||||
obfs_plugin="v2ray"
|
|
||||||
obfs_type="http"
|
|
||||||
config_load shadowsocks-rust
|
config_load shadowsocks-rust
|
||||||
config_foreach _get_ss_redir ss_redir
|
config_foreach _get_ss_redir ss_redir
|
||||||
config_foreach _get_ss_server server
|
config_foreach _get_ss_server server
|
||||||
# Force disable fast open for now du to problem on 6.1 with MPTCP
|
# Force disable fast open for now du to problem on 6.1 with MPTCP
|
||||||
fast_open="false"
|
fast_open="false"
|
||||||
|
|
||||||
if [ "$current_mptcp" != "$mptcp" ] || [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ] || [ "$current_fast_open" != "$fast_open" ]; then
|
#if [ "$current_mptcp" != "$mptcp" ] || [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ] || [ "$current_fast_open" != "$fast_open" ]; then
|
||||||
|
if [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ]; then
|
||||||
local settings
|
local settings
|
||||||
settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":false,"mptcp":'$mptcp'}'
|
settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":false,"mptcp":'$mptcp'}'
|
||||||
result=$(_set_json "shadowsocks-go" "$settings")
|
result=$(_set_json "shadowsocks-go" "$settings")
|
||||||
|
@ -943,9 +941,9 @@ _set_lan_ip() {
|
||||||
local settings
|
local settings
|
||||||
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
|
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
|
||||||
[ -z "$vps_config" ] && return
|
[ -z "$vps_config" ] && return
|
||||||
#lanip_current="$(echo "$vps_config" | jsonfilter -q -e '@.lan.ips')"
|
lanip_current="$(echo "$vps_config" | jsonfilter -q -e '@.lan.ips' | sed -e 's:\\::g' -e 's:\[::g' -e 's:\]::g')"
|
||||||
#if [ "$lanips" != "" ] && [ "$lanip_current" != "$lanips" ]; then
|
if [ "$lanips" != "" ] && [ "$lanip_current" != "$lanips" ]; then
|
||||||
if [ "$lanips" != "" ]; then
|
#if [ "$lanips" != "" ]; then
|
||||||
settings='{"lanips" : ['$lanips']}'
|
settings='{"lanips" : ['$lanips']}'
|
||||||
result=$(_set_json "lan" "$settings")
|
result=$(_set_json "lan" "$settings")
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue