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

luci-app-passwall: sync upstream

Browse Source 
last commit: bda60d2171
This commit is contained in:
gitea-action 2024-11-17 19:00:21 +08:00
parent 35d6180279
commit 167ee6697a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
View File

@ -321,7 +321,7 @@ o = s:option(ListValue, option_name("flow"), translate("flow"))
o.default = "" o.default = ""
o:value("", translate("Disable")) o:value("", translate("Disable"))
o:value("xtls-rprx-vision") o:value("xtls-rprx-vision")
o:depends({ [option_name("protocol")] = "vless", [option_name("tls")] = true, [option_name("transport")] = "tcp" }) o:depends({ [option_name("protocol")] = "vless", [option_name("tls")] = true, [option_name("transport")] = "raw" })
o = s:option(Flag, option_name("tls"), translate("TLS")) o = s:option(Flag, option_name("tls"), translate("TLS"))
o.default = 0 o.default = 0

2
luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua
View File

@ -109,7 +109,7 @@ o = s:option(ListValue, option_name("flow"), translate("flow"))
o.default = "" o.default = ""
o:value("", translate("Disable")) o:value("", translate("Disable"))
o:value("xtls-rprx-vision") o:value("xtls-rprx-vision")
o:depends({ [option_name("protocol")] = "vless", [option_name("tls")] = true, [option_name("transport")] = "RAW" }) o:depends({ [option_name("protocol")] = "vless", [option_name("tls")] = true, [option_name("transport")] = "raw" })
o = s:option(Flag, option_name("tls"), translate("TLS")) o = s:option(Flag, option_name("tls"), translate("TLS"))
o.default = 0 o.default = 0

4
luci-app-passwall/luasrc/passwall/util_xray.lua
View File

@ -267,7 +267,7 @@ function gen_outbound(flag, node, tag, proxy_table)
level = 0, level = 0,
security = (node.protocol == "vmess") and node.security or nil, security = (node.protocol == "vmess") and node.security or nil,
encryption = node.encryption or "none", encryption = node.encryption or "none",
flow = (node.protocol == "vless" and node.tls == "1" and node.transport == "tcp" and node.flow and node.flow ~= "") and node.flow or nil flow = (node.protocol == "vless" and node.tls == "1" and node.transport == "raw" and node.flow and node.flow ~= "") and node.flow or nil
} }
} }
} }
@ -370,7 +370,7 @@ function gen_config_server(node)
for i = 1, #node.uuid do for i = 1, #node.uuid do
clients[i] = { clients[i] = {
id = node.uuid[i], id = node.uuid[i],
flow = ("vless" == node.protocol and "1" == node.tls and "tcp" == node.transport and node.flow and node.flow ~= "") and node.flow or nil flow = ("vless" == node.protocol and "1" == node.tls and "raw" == node.transport and node.flow and node.flow ~= "") and node.flow or nil
} }
end end
settings = { settings = {