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

luci: update UoT depends

Browse Source
This commit is contained in:
xiaorouji 2024-02-01 16:34:07 +08:00 committed by sbwml
parent 2518b3aea5
commit 5382acf6a2
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.73-2 PKG_VERSION:=4.73-3
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

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

@ -237,10 +237,8 @@ o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encryp
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "chacha20-poly1305" }) o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "chacha20-poly1305" })
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "xchacha20-poly1305" }) o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "xchacha20-poly1305" })
o = s:option(Flag, option_name("uot"), translate("UDP over TCP"), translate("Need Xray-core or sing-box as server side.")) o = s:option(Flag, option_name("uot"), translate("UDP over TCP"))
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "2022-blake3-aes-128-gcm" }) o:depends({ [option_name("protocol")] = "shadowsocks" })
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "2022-blake3-aes-256-gcm" })
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("x_ss_encrypt_method")] = "2022-blake3-chacha20-poly1305" })
o = s:option(Value, option_name("uuid"), translate("ID")) o = s:option(Value, option_name("uuid"), translate("ID"))
o.password = true o.password = true

7
luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
View File

@ -231,10 +231,9 @@ if singbox_tags:find("with_shadowsocksr") then
o:depends({ [option_name("protocol")] = "shadowsocksr" }) o:depends({ [option_name("protocol")] = "shadowsocksr" })
end end
o = s:option(Flag, option_name("uot"), translate("UDP over TCP"), translate("Need Xray-core or sing-box as server side.")) o = s:option(Flag, option_name("uot"), translate("UDP over TCP"))
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("ss_method")] = "2022-blake3-aes-128-gcm" }) o:depends({ [option_name("protocol")] = "socks" })
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("ss_method")] = "2022-blake3-aes-256-gcm" }) o:depends({ [option_name("protocol")] = "shadowsocks" })
o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("ss_method")] = "2022-blake3-chacha20-poly1305" })
o = s:option(Value, option_name("uuid"), translate("ID")) o = s:option(Value, option_name("uuid"), translate("ID"))
o.password = true o.password = true

7
luci-app-passwall/luasrc/passwall/util_sing-box.lua
View File

@ -183,7 +183,10 @@ function gen_outbound(flag, node, tag, proxy_table)
version = "5", version = "5",
username = (node.username and node.password) and node.username or nil, username = (node.username and node.password) and node.username or nil,
password = (node.username and node.password) and node.password or nil, password = (node.username and node.password) and node.password or nil,
udp_over_tcp = false, udp_over_tcp = node.uot == "1" and {
enabled = true,
version = 2
} or nil,
} }
end end
@ -888,6 +891,7 @@ function gen_config(var)
password = parsed1.password, password = parsed1.password,
address = parsed1.host, address = parsed1.host,
port = parsed1.port, port = parsed1.port,
uot = "1",
} }
local preproxy_outbound = gen_outbound(flag, _node, preproxy_tag) local preproxy_outbound = gen_outbound(flag, _node, preproxy_tag)
if preproxy_outbound then if preproxy_outbound then
@ -944,6 +948,7 @@ function gen_config(var)
password = parsed1.password, password = parsed1.password,
address = parsed1.host, address = parsed1.host,
port = parsed1.port, port = parsed1.port,
uot = "1",
} }
local _outbound = gen_outbound(flag, _node, rule_name) local _outbound = gen_outbound(flag, _node, rule_name)
if _outbound then if _outbound then

3
luci-app-passwall/po/zh-cn/passwall.po
View File

@ -1078,9 +1078,6 @@ msgstr "IV 检查"
msgid "UDP over TCP" msgid "UDP over TCP"
msgstr "TCP 封装 UDP" msgstr "TCP 封装 UDP"
msgid "Need Xray-core or sing-box as server side."
msgstr "需要 Xray-core 或者 sing-box 作为服务器端。"
msgid "Connection Timeout" msgid "Connection Timeout"
msgstr "连接超时时间" msgstr "连接超时时间"