From a7c0242e89eae8b69805a8047057a44789d7b7aa Mon Sep 17 00:00:00 2001 From: gitea-action Date: Mon, 4 Nov 2024 22:23:50 +0800 Subject: [PATCH] luci-app-ssr-plus: sync upstream last commit: https://github.com/fw876/helloworld/commit/6ffe77cc0b35738dffc1b82506e95fad3da78351 --- .../root/usr/share/shadowsocksr/gen_config.lua | 3 ++- patch-luci-app-ssr-plus.patch | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index e95b96ba3..59cee0808 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -324,7 +324,8 @@ if xray_fragment.fragment ~= "0" or (xray_fragment.noise ~= "0" and xray_noise.e }, streamSettings = { sockopt = { - tcpNoDelay = true + tcpMptcp = (server.mptcp == "1") and true or false, -- MPTCP + tcpNoDelay = (server.mptcp == "1") and true or false -- MPTCP } } }) diff --git a/patch-luci-app-ssr-plus.patch b/patch-luci-app-ssr-plus.patch index b90ad14ec..5625290f0 100644 --- a/patch-luci-app-ssr-plus.patch +++ b/patch-luci-app-ssr-plus.patch @@ -842,15 +842,3 @@ index f637d50..fb9ed57 100755 fi #chinadns-ng if [ "$(uci -q get "dhcp.@dnsmasq[0]._unused_ssrp_changed")" = "1" ]; then -diff --git a/luci-app-ssr-plus/root/usr/bin/ssr-rules b/luci-app-ssr-plus/root/usr/bin/ssr-rules -index e0e0e8f..547d910 100755 ---- a/luci-app-ssr-plus/root/usr/bin/ssr-rules -+++ b/luci-app-ssr-plus/root/usr/bin/ssr-rules -@@ -103,7 +103,6 @@ ipset_r() { - $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN - $IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW - $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW -- $IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW - ;; - oversea) - ipset -N oversea hash:net 2>/dev/null