diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 44df06797..3ac9c4304 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -323,10 +323,12 @@ _set_ssgo_server_vps() { config_load shadowsocks-rust config_foreach _get_ss_redir ss_redir config_foreach _get_ss_server server + # Force disable fast open for now du to problem on 6.1 with MPTCP + fast_open="false" if [ "$current_mptcp" != "$mptcp" ] || [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ] || [ "$current_fast_open" != "$fast_open" ]; then local settings - settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":true,"mptcp":'$mptcp'}' + settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":false,"mptcp":'$mptcp'}' result=$(_set_json "shadowsocks-go" "$settings") fi } @@ -1591,7 +1593,7 @@ _set_config_from_vps() { set shadowsocks-rust.sss0.server_port=$ss_port set shadowsocks-rust.sss0.method=$ss_method EOF - config_foreach _set_ssrust_server server "key" $ssgo_sskey + config_foreach _set_ssrust_server server "password" $ssgo_sskey config_foreach _set_ssrust_server server "method" $ss_method if [ "$(uci -q get shadowsocks-rust.sss0.server)" != "127.0.0.1" ]; then config_foreach _set_ssrust_server server "server" $vpsip @@ -1647,7 +1649,7 @@ _set_config_from_vps() { set xray.omrout.s_vless_user_id="$xray_key" set xray.omrout.s_vless_port="$xray_port" EOF - uci -q set xray.omrout.s_shadowsocks_password=$ss_key + #uci -q set xray.omrout.s_shadowsocks_password=$xray_sskey if [ "$(uci -q get xray.omrout.s_vmess_address)" != "127.0.0.1" ]; then uci -q set xray.omrout.s_vmess_address="$vpsip" uci -q set xray.omrout.s_vless_address="$vpsip" diff --git a/shadowsocks-rust/files/shadowsocks-rust.config b/shadowsocks-rust/files/shadowsocks-rust.config index 82d13a389..8dfa5197a 100644 --- a/shadowsocks-rust/files/shadowsocks-rust.config +++ b/shadowsocks-rust/files/shadowsocks-rust.config @@ -7,25 +7,10 @@ config ss_redir hi1 option fast_open 0 option verbose 0 option syslog 1 - option reuse_port 1 + option reuse_port 0 option mptcp 1 option ipv6_first 1 - option no_delay 1 - -config ss_redir hi2 - option server 'sss0' - option local_address '0.0.0.0' - option local_port '1100' - option mode 'tcp_and_udp' - option timeout '1000' - option fast_open 1 - option verbose 0 - option syslog 1 - option reuse_port 1 - option mptcp 1 - option ipv6_first 1 - option no_delay 1 - option disabled 1 + option no_delay 0 config ss_rules 'ss_rules' option disabled 0 @@ -39,7 +24,7 @@ config server 'sss0' option disabled 1 option server '192.168.1.3' option server_port '65280' - option key '' + option password '' option method '2022-blake3-aes-256-gcm' option obfs 0