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 pull request #361 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-10-04 12:11:47 -05:00 • committed by GitHub
commit 1b2fc70e59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -323,10 +323,12 @@ _set_ssgo_server_vps() {
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
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
local settings 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") result=$(_set_json "shadowsocks-go" "$settings")
fi fi
} }
@ -1591,7 +1593,7 @@ _set_config_from_vps() {
set shadowsocks-rust.sss0.server_port=$ss_port set shadowsocks-rust.sss0.server_port=$ss_port
set shadowsocks-rust.sss0.method=$ss_method set shadowsocks-rust.sss0.method=$ss_method
EOF 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 config_foreach _set_ssrust_server server "method" $ss_method
if [ "$(uci -q get shadowsocks-rust.sss0.server)" != "127.0.0.1" ]; then if [ "$(uci -q get shadowsocks-rust.sss0.server)" != "127.0.0.1" ]; then
config_foreach _set_ssrust_server server "server" $vpsip 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_user_id="$xray_key"
set xray.omrout.s_vless_port="$xray_port" set xray.omrout.s_vless_port="$xray_port"
EOF 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 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_vmess_address="$vpsip"
uci -q set xray.omrout.s_vless_address="$vpsip" uci -q set xray.omrout.s_vless_address="$vpsip"

21
shadowsocks-rust/files/shadowsocks-rust.config
View file

@ -7,25 +7,10 @@ config ss_redir hi1
option fast_open 0 option fast_open 0
option verbose 0 option verbose 0
option syslog 1 option syslog 1
option reuse_port 1 option reuse_port 0
option mptcp 1 option mptcp 1
option ipv6_first 1 option ipv6_first 1
option no_delay 1 option no_delay 0
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
config ss_rules 'ss_rules' config ss_rules 'ss_rules'
option disabled 0 option disabled 0
@ -39,7 +24,7 @@ config server 'sss0'
option disabled 1 option disabled 1
option server '192.168.1.3' option server '192.168.1.3'
option server_port '65280' option server_port '65280'
option key '' option password ''
option method '2022-blake3-aes-256-gcm' option method '2022-blake3-aes-256-gcm'
option obfs 0 option obfs 0