From bea73de8fc524272a521867ad87fbab2c3d16f9d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 4 Oct 2023 11:25:47 +0200 Subject: [PATCH 01/11] Force disable Fast Open for Shadowsocks Rust/Go --- .../files/etc/init.d/openmptcprouter-vps | 4 +++- .../files/shadowsocks-rust.config | 21 +++---------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 44df06797..4bf424048 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 } 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 From 9519b730512ae0c9cf504d780a563891ead4365c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 4 Oct 2023 12:00:52 +0200 Subject: [PATCH 02/11] Fix Xray Shadowsocks 2022 key --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 4bf424048..a575b5645 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -1649,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" From 23d024beb7f2ea9971c13a9f5b787343d79a6fc7 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 4 Oct 2023 12:03:25 +0200 Subject: [PATCH 03/11] Fix Shadowsocks Rust password --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index a575b5645..3ac9c4304 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -1593,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 From 4804de524140d024e137668f68744f66ac514891 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 5 Oct 2023 07:51:57 +0200 Subject: [PATCH 04/11] Should fix https://github.com/Ysurac/openmptcprouter/issues/2989 --- luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm index 83016ce63..0b66c1662 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm @@ -28,7 +28,7 @@ menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter" lastmodif="" allbackup=luci.model.uci.cursor():get("openmptcprouter",servername,"allbackup") for _, backup in pairs(allbackup) do - filemodif=split(backup, '|') + filemodif=luci.util.split(backup, '|') if filemodif[2] ~= lastmodif then lastmodif=filemodif[2] %> From fbcbcc80ab7f94d90a358a1f6fbb5ac6e86492bd Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 5 Oct 2023 17:45:21 +0200 Subject: [PATCH 05/11] Fix Shadowsocks Rust crypto change --- .../luasrc/controller/openmptcprouter.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 45a55985a..299e3bd95 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -926,8 +926,8 @@ function wizard_add() ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm") ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm") elseif encryption == "aes-256-cfb" then ucic:set("openmptcprouter","settings","encryption","aes-256-cfb") ucic:set("shadowsocks-libev","sss0","method","aes-256-cfb") @@ -945,15 +945,15 @@ function wizard_add() ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm") ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm") - ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm") elseif encryption == "chacha20-ietf-poly1305" then ucic:set("openmptcprouter","settings","encryption","chacha20") ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305") ucic:set("shadowsocks-libev","sss1","method","chacha20-ietf-poly1305") ucic:set("glorytun","vpn","chacha20","1") ucic:set("glorytun-udp","vpn","chacha","1") - ucic:set("openvpn","omr","cipher","AES-256-CBC") + ucic:set("openvpn","omr","cipher","AES-256-GCM") ucic:set("mlvpn","general","cleartext_data","0") ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305") ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305") @@ -964,8 +964,10 @@ function wizard_add() ucic:set("xray","omrout","s_trojan_user_security","chacha20-poly1305") ucic:set("xray","omrout","s_socks_user_security","chacha20-poly1305") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-chacha20-poly1305") - ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-chacha20-poly1305") - ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-chacha20-poly1305") + --ucic:set("shadowsocks-rust","sss0","method","2022-blake3-chacha20-poly1305") + --ucic:set("shadowsocks-rust","sss1","method","2022-blake3-chacha20-poly1305") + ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm") + ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm") else ucic:set("openmptcprouter","settings","encryption","other") end From 4f7efcd9115173d6ed9025e4377f7600c6110545 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Oct 2023 11:16:52 +0200 Subject: [PATCH 06/11] Fix Shadowsocks Rust tracker --- omr-tracker/files/bin/omr-tracker-ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss index c1f00a345..82b7ad3ce 100755 --- a/omr-tracker/files/bin/omr-tracker-ss +++ b/omr-tracker/files/bin/omr-tracker-ss @@ -166,7 +166,7 @@ while true; do /etc/init.d/shadowsocks-libev restart sleep 5 fi - if [ "$type" = "rust" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then + if [ "$type" = "rust" ] && [ "$(pgrep sslocal)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then _log "Can't find shadowsocks rust, restart it..." /etc/init.d/shadowsocks-rust restart sleep 5 From 5869e2f6041bc789e67803bd2c778bd52cce334b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Oct 2023 11:17:44 +0200 Subject: [PATCH 07/11] Fix RUTX50 Leds --- .../usr/share/omr/post-tracking.d/050-rutx | 35 +++++++++++++++ .../files/etc/uci-defaults/2060-omr-system | 45 ++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/050-rutx b/mptcp/files/usr/share/omr/post-tracking.d/050-rutx index c815264a9..c4a2bc2dc 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/050-rutx +++ b/mptcp/files/usr/share/omr/post-tracking.d/050-rutx @@ -93,3 +93,38 @@ if [ -n "$(grep RUTX /etc/board.json)" ] && [ -z "$(grep RUTX50 /etc/board.json) fi fi fi +if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$(grep RUTX50 /etc/board.json)" ] && [ -n "$OMR_TRACKER_DEVICE" ]; then + if [ "$OMR_TRACKER_DEVICE" = "wwan0" ]; then + modemdata=$(omr-modemmanager '/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb2/2-1' all) + gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n') + if [ "$gen" = "gsm" ]; then + echo "default-on" > /sys/class/leds/green:3g/trigger + echo "none" > /sys/class/leds/green:4g/trigger + echo "none" > /sys/class/leds/green:5g/trigger + elif [ "$gen" = "umts" ]; then + echo "none" > /sys/class/leds/green:3g/trigger + echo "default-on" > /sys/class/leds/green:4g/trigger + echo "none" > /sys/class/leds/green:5g/trigger + elif [ "$gen" = "lte" ]; then + echo "none" > /sys/class/leds/green:3g/trigger + echo "none" > /sys/class/leds/green:4g/trigger + echo "default-on" > /sys/class/leds/green:5g/trigger + fi + bar=$(echo $modemdata | cut -d ';' -f 1 | tr -d '\n') + if [ "$bar" -gt "10" ]; then + echo "default-on" > /sys/class/leds/green:rssi0/trigger + else + echo "none" > /sys/class/leds/green:rssi0/trigger + fi + if [ "$bar" -gt "50" ]; then + echo "default-on" > /sys/class/leds/green:rssi1/trigger + else + echo "none" > /sys/class/leds/green:rssi1/trigger + fi + if [ "$bar" -gt "70" ]; then + echo "default-on" > /sys/class/leds/green:rssi2/trigger + else + echo "none" > /sys/class/leds/green:rssi2/trigger + fi + fi +fi diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system index fbb1a6912..ec8de8d5b 100755 --- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system +++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system @@ -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' From 2ee3878886873648e03d57a79af008288810dfbe Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Oct 2023 11:28:08 +0200 Subject: [PATCH 08/11] Fix wait_test parameter on omr-tracker --- omr-tracker/files/etc/init.d/omr-tracker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker index 9a78b2378..31be2a0d5 100755 --- a/omr-tracker/files/etc/init.d/omr-tracker +++ b/omr-tracker/files/etc/init.d/omr-tracker @@ -243,7 +243,7 @@ _launch_shadowsocks_tracker() { procd_append_param env "OMR_TRACKER_TRIES=$tries" procd_append_param env "OMR_TRACKER_INTERVAL=$interval" procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:$local_port" - procd_append_param env "OMR_TRACKER_WAIT_TEST=$type" + procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test" procd_append_param env "OMR_TRACKER_SERVER=$server" procd_append_param env "OMR_TRACKER_SS_TYPE=libev" procd_set_param limits nofile="51200 51200" @@ -277,7 +277,7 @@ _launch_shadowsocks_rust_tracker() { procd_append_param env "OMR_TRACKER_TRIES=$tries" procd_append_param env "OMR_TRACKER_INTERVAL=$interval" procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:$local_port" - procd_append_param env "OMR_TRACKER_WAIT_TEST=$type" + procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test" procd_append_param env "OMR_TRACKER_SERVER=$server" procd_append_param env "OMR_TRACKER_SS_TYPE=rust" procd_set_param limits nofile="51200 51200" From e56c73bf7d7fbca4287ef96ce7828e8bfa1242a1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Oct 2023 15:04:05 +0200 Subject: [PATCH 09/11] Fix issue when bypassing a proto without ndpi --- luci-app-omr-bypass/root/etc/init.d/omr-bypass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass index 29bb9b35c..cfb3beb6d 100755 --- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass +++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass @@ -498,11 +498,19 @@ _bypass_proto_without_ndpi() { ALLIPS=$(sqlite3 /usr/share/omr-bypass/omr-bypass.db "select ip from ipproto where proto=\"$proto\";" ".exit") if [ -n "$ALLIPS" ]; then ipset -q flush bypass_$proto > /dev/null 2>&1 + ipset -q flush bypass6_$proto > /dev/null 2>&1 ipset -q --exist restore <<-EOF create bypass_$proto hash:net hashsize 64 + create bypass6_$proto hash:net hashsize 64 EOF for ip in $ALLIPS; do - ipset -q add bypass_$proto $ip + valid_ip4=$( valid_subnet4 $ip) + valid_ip6=$( valid_subnet6 $ip) + if [ "$valid_ip4" = "ok" ]; then + ipset -q add bypass_$proto $ip + elif [ "$valid_ip6" = "ok" ]; then + ipset -q add bypass6_$proto $ip + fi done if [ "$intf" = "all" ]; then if [ "$family" = "ipv4" ] || [ "$family" = "ipv4ipv6" ]; then @@ -516,7 +524,7 @@ _bypass_proto_without_ndpi() { if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then $IP6TABLESRESTORE -w --wait=60 --noflush <<-EOF *mangle - -A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539 + -A omr-bypass6-dpi -m set --match-set bypass6_$proto dst -j MARK --set-mark 0x6539 -A omr-bypass6-dpi -m mark --mark 0x6539 -j RETURN COMMIT EOF @@ -533,7 +541,7 @@ _bypass_proto_without_ndpi() { if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then $IP6TABLESRESTORE -w --wait=60 --noflush <<-EOF *mangle - -A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539$intfid + -A omr-bypass6-dpi -m set --match-set bypass6_$proto dst -j MARK --set-mark 0x6539$intfid -A omr-bypass6-dpi -m mark --mark 0x6539$intfid -j RETURN COMMIT EOF From 7aec8f94709c842ed9de5720c8533e106d5e257e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Oct 2023 16:51:34 +0200 Subject: [PATCH 10/11] Fix error when VPN is set to none --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 1 + 1 file changed, 1 insertion(+) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 3ac9c4304..6da45ffc5 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -927,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}') From e93e2a6ab0242357f77dddf997cc4e944c668a1a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Oct 2023 16:52:16 +0200 Subject: [PATCH 11/11] Fix loop restart of openmptcprouter-vps when shadowsocks-rust is used --- mptcp/files/usr/share/omr/post-tracking.d/010-services | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/010-services b/mptcp/files/usr/share/omr/post-tracking.d/010-services index 9a20c4796..f2407ea01 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/010-services +++ b/mptcp/files/usr/share/omr/post-tracking.d/010-services @@ -115,7 +115,7 @@ set_get_config() { [ -n "$server" ] && uci -q set openmptcprouter.${server}.get_config=1 } -if ([ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]) || ([ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "192.18.1.3" ]); then +if ([ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]) || ([ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.password)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "192.18.1.3" ]); then config_load openmptcprouter config_foreach set_get_config server [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter