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

luci-app-passwall2: sync upstream

Browse Source
This commit is contained in:
actions 2024-02-01 17:00:10 +08:00
parent 82638e1ecf
commit 3b419bd4ad
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
View File

@ -611,4 +611,18 @@ if singbox_tags:find("with_utls") then
o:depends({ [option_name("shadowtls")] = true, [option_name("shadowtls_utls")] = true }) o:depends({ [option_name("shadowtls")] = true, [option_name("shadowtls_utls")] = true })
end end
-- [[ SIP003 plugin ]]--
o = s:option(Flag, option_name("plugin_enabled"), translate("plugin"))
o.default = 0
o:depends({ [option_name("protocol")] = "shadowsocks" })
o = s:option(ListValue, option_name("plugin"), "SIP003 " .. translate("plugin"))
o.default = "obfs-local"
o:depends({ [option_name("plugin_enabled")] = true })
o:value("obfs-local")
o:value("v2ray-plugin")
o = s:option(Value, option_name("plugin_opts"), translate("opts"))
o:depends({ [option_name("plugin_enabled")] = true })
api.luci_types(arg[1], m, s, type_name, option_prefix) api.luci_types(arg[1], m, s, type_name, option_prefix)

4
luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
View File

@ -205,8 +205,8 @@ function gen_outbound(flag, node, tag, proxy_table)
protocol_table = { protocol_table = {
method = node.method or nil, method = node.method or nil,
password = node.password or "", password = node.password or "",
plugin = node.plugin and nil, plugin = (node.plugin_enabled and node.plugin) or nil,
plugin_opts = node.plugin_opts and nil, plugin_opts = (node.plugin_enabled and node.plugin_opts) or nil,
udp_over_tcp = node.uot == "1" and { udp_over_tcp = node.uot == "1" and {
enabled = true, enabled = true,
version = 2 version = 2