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

luci: add Xray Vision XUDP Mux support (#2503)

Browse Source
This commit is contained in:
Gzxhwq 2023-04-18 07:39:14 +08:00 committed by sbwml
parent d9a1084637
commit 22940c0f9b
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua
View File

@ -933,11 +933,21 @@ mux:depends({ type = "Xray", protocol = "socks" })
mux:depends({ type = "Xray", protocol = "shadowsocks" }) mux:depends({ type = "Xray", protocol = "shadowsocks" })
mux:depends({ type = "Xray", protocol = "trojan" }) mux:depends({ type = "Xray", protocol = "trojan" })
-- [[ XUDP Mux ]]--
xmux = s:option(Flag, "xmux", translate("Mux"))
xmux.default = 1
xmux:depends({ type = "Xray", protocol = "vless", tlsflow = "xtls-rprx-vision" })
xmux:depends({ type = "Xray", protocol = "vless", tlsflow = "xtls-rprx-vision-udp443" })
mux_concurrency = s:option(Value, "mux_concurrency", translate("Mux concurrency")) mux_concurrency = s:option(Value, "mux_concurrency", translate("Mux concurrency"))
mux_concurrency.default = 8 mux_concurrency.default = 8
mux_concurrency:depends("mux", true) mux_concurrency:depends("mux", true)
mux_concurrency:depends("smux", true) mux_concurrency:depends("smux", true)
xudp_concurrency = s:option(Value, "xudp_concurrency", translate("XUDP Mux concurrency"))
xudp_concurrency.default = 8
xudp_concurrency:depends("xmux", true)
smux_idle_timeout = s:option(Value, "smux_idle_timeout", translate("Mux idle timeout")) smux_idle_timeout = s:option(Value, "smux_idle_timeout", translate("Mux idle timeout"))
smux_idle_timeout.default = 60 smux_idle_timeout.default = 60
smux_idle_timeout:depends("smux", true) smux_idle_timeout:depends("smux", true)

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

@ -116,8 +116,9 @@ function gen_outbound(flag, node, tag, proxy_table)
proxySettings = node.proxySettings or nil, proxySettings = node.proxySettings or nil,
protocol = node.protocol, protocol = node.protocol,
mux = { mux = {
enabled = (node.mux == "1") and true or false, enabled = (node.mux == "1" or node.xmux == "1") and true or false,
concurrency = (node.mux_concurrency) and tonumber(node.mux_concurrency) or 8 concurrency = (node.mux == "1" and ((node.mux_concurrency) and tonumber(node.mux_concurrency) or 8)) or ((node.xmux == "1") and -1) or nil,
xudpConcurrency = (node.xmux == "1" and ((node.xudp_concurrency) and tonumber(node.xudp_concurrency) or 8)) or nil
} or nil, } or nil,
-- 底层传输配置 -- 底层传输配置
streamSettings = (node.streamSettings or node.protocol == "vmess" or node.protocol == "vless" or node.protocol == "socks" or node.protocol == "shadowsocks" or node.protocol == "trojan") and { streamSettings = (node.streamSettings or node.protocol == "vmess" or node.protocol == "vless" or node.protocol == "socks" or node.protocol == "shadowsocks" or node.protocol == "trojan") and {

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

@ -1360,6 +1360,9 @@ msgstr "无法移动新文件到：%s"
msgid "Mux concurrency" msgid "Mux concurrency"
msgstr "最大并发连接数" msgstr "最大并发连接数"
msgid "XUDP Mux concurrency"
msgstr "XUDP 最大并发连接数"
msgid "Mux idle timeout" msgid "Mux idle timeout"
msgstr "最大闲置时间" msgstr "最大闲置时间"