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 2023-10-07 23:40:56 +08:00
commit b82119b759
10 changed files with 113 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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
}
@ -925,6 +927,7 @@ _set_vpn_ip() {
local settings
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
[ "$(uci -q get openmptcprouter.settings.vpn)" = "none" ] && return
vpnifname="$(uci -q get network.omrvpn.device)"
vpnip_local_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.remoteip')"
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}')
@ -1591,7 +1594,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 +1650,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"

45
openmptcprouter/files/etc/uci-defaults/2060-omr-system
View file

@ -39,7 +39,50 @@ fi
EOF
}
if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx50)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
uci -q batch <<-EOF >/dev/null
add system led
set system.@led[-1].sysfs='green:eth'
set system.@led[-1].name='WAN_ETH'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='eth0'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].sysfs='green:wifi'
set system.@led[-1].name='WAN_WIFI'
set system.@led[-1].trigger='netdev'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].sysfs='green:sim1'
set system.@led[-1].name='WAN_MODEM1'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='wwan0'
set system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='WAN_MODEM2'
set system.@led[-1].sysfs='green:sim2'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='wwan1'
set system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='WIFI24'
set system.@led[-1].sysfs='green:wifi2g'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='radio0.network1'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
add system led
set system.@led[-1].name='WIFI5'
set system.@led[-1].sysfs='green:wifi5g'
set system.@led[-1].trigger='netdev'
set system.@led[-1].dev='radio1.network1'
add_list system.@led[-1].mode='tx'
add_list system.@led[-1].mode='rx'
commit system
EOF
elif [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
uci -q batch <<-EOF >/dev/null
add system led
set system.@led[-1].sysfs='wan_wifi_4'