zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-ssr-plus: remove sing protocol

Browse Source 
Sing protocol should be used with sing-box.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-08-18 00:18:24 +08:00 committed by sbwml
parent f0045b02a2
commit abb117d64e
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
View File

@ -55,15 +55,6 @@ function trojan_shadowsocks()
if server.v2ray_protocol == "shadowsocksr" then if server.v2ray_protocol == "shadowsocksr" then
server.v2ray_protocol = "shadowsocks" server.v2ray_protocol = "shadowsocks"
--[[ elseif (server.v2ray_protocol == "shadowsocks") and (server.mux ~= "1") and (not (outbound_settings.plugin or server.transport ~= "tcp" or server.tls or server.xtls)) then
server.v2ray_protocol = "shadowsocks_sing"
outbound_settings = outbound_settings.servers[1]
elseif (server.v2ray_protocol == "trojan") and (server.tls and server.mux ~= "1") and (not (server.transport ~= "tcp" or server.xtls)) then
server.v2ray_protocol = "trojan_sing"
outbound_settings = outbound_settings.servers[1]
outbound_settings.serverName = server.tls_host
outbound_settings.insecure = (server.insecure == "1") and true or false
]]
end end
end end
function socks_http() function socks_http()
@ -161,7 +152,7 @@ local Xray = {
protocol = server.v2ray_protocol, protocol = server.v2ray_protocol,
settings = outbound_settings, settings = outbound_settings,
-- 底层传输配置 -- 底层传输配置
streamSettings = (server.v2ray_protocol and server.v2ray_protocol:sub(-#"_sing") ~= "_sing") and { streamSettings = {
network = server.transport or "tcp", network = server.transport or "tcp",
security = (server.xtls == '1') and "xtls" or (server.tls == '1') and "tls" or nil, security = (server.xtls == '1') and "xtls" or (server.tls == '1') and "tls" or nil,
tlsSettings = (server.tls == '1' and (server.insecure == "1" or server.tls_host or server.fingerprint)) and { tlsSettings = (server.tls == '1' and (server.insecure == "1" or server.tls_host or server.fingerprint)) and {
@ -231,7 +222,7 @@ local Xray = {
permit_without_stream = (server.permit_without_stream == "1") and true or nil, permit_without_stream = (server.permit_without_stream == "1") and true or nil,
initial_windows_size = tonumber(server.initial_windows_size) or nil initial_windows_size = tonumber(server.initial_windows_size) or nil
} or nil } or nil
} or nil, },
mux = (server.mux == "1" and server.xtls ~= "1" and server.transport ~= "grpc") and { mux = (server.mux == "1" and server.xtls ~= "1" and server.transport ~= "grpc") and {
-- mux -- mux
enabled = true, enabled = true,