From f59abc75251e1efe85e687acb7e0cb498803e128 Mon Sep 17 00:00:00 2001 From: zxl hhyccc <45259624+zxlhhyccc@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:53:51 +0800 Subject: [PATCH 1/2] luci-app-ssr-plus: Fixed problem subscription `reality`does not read `tls_flow`. --- luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index a6c2f7c601d..34b09504324 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -362,10 +362,9 @@ local function processData(szType, content) result.vmess_id = url.user result.vless_encryption = params.encryption or "none" result.transport = params.type or "tcp" - result.tls = (params.security == "tls") and "1" or "0" + result.tls = (params.security == "tls" or params.security == "xtls") and "1" or "0" result.tls_host = params.sni - result.xtls = (params.security == "xtls") and "1" or nil - result.tls_flow = (result.tls == "1" or result.xtls == "1" or result.reality == "1") and params.flow or nil + result.tls_flow = (params.security == "tls" or params.security == "reality") and params.flow or nil result.fingerprint = params.fp result.reality = (params.security == "reality") and "1" or "0" result.reality_publickey = params.pbk and UrlDecode(params.pbk) or nil From e27980dd78d7e4dd90772d06c808b381659388bd Mon Sep 17 00:00:00 2001 From: zxl hhyccc <45259624+zxlhhyccc@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:55:34 +0800 Subject: [PATCH 2/2] luci-app-ssr-plus: Fixed problem subscription `reality`does not read `tls_flow`. --- .../luasrc/model/cbi/shadowsocksr/client-config.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index c55e0ff0961..1048aa495af 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -927,7 +927,6 @@ if is_finded("xray") then o:value(v, translate(v)) end o.rmempty = true - o:depends("xtls", true) o:depends({type = "v2ray", v2ray_protocol = "vless", transport = "tcp", tls = true}) o:depends({type = "v2ray", v2ray_protocol = "vless", transport = "tcp", reality = true})