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: c9b28143f6
This commit is contained in:
actions 2024-04-30 18:00:05 +08:00
parent 6361a14d7b
commit a07e9736c3
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@ if has_xray then
o.default = "10-20" o.default = "10-20"
o:depends("fragment", true) o:depends("fragment", true)
o = s_xray:option(Flag, "sniffing", translate("Sniffing"), translate("When using the shunt, must be enabled, otherwise the shunt will invalid.")) o = s_xray:option(Flag, "sniffing", translate("Sniffing"), translate("When using the shunt, this option will be forced to be enabled."))
o.default = 1 o.default = 1
o.rmempty = false o.rmempty = false

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

@ -616,10 +616,10 @@ function gen_config(var)
settings = {network = "tcp,udp", followRedirect = true}, settings = {network = "tcp,udp", followRedirect = true},
streamSettings = {sockopt = {tproxy = "tproxy"}}, streamSettings = {sockopt = {tproxy = "tproxy"}},
sniffing = { sniffing = {
enabled = xray_settings.sniffing == "1" and true or false, enabled = xray_settings.sniffing == "1" or node.protocol == "_shunt",,
destOverride = {"http", "tls", "quic"}, destOverride = {"http", "tls", "quic"},
metadataOnly = false, metadataOnly = false,
routeOnly = (xray_settings.sniffing == "1" and xray_settings.route_only == "1") and true or nil, routeOnly = (xray_settings.sniffing == "1" and xray_settings.route_only == "1") or (xray_settings.sniffing == "0" and node.protocol == "_shunt"),
domainsExcluded = (xray_settings.sniffing == "1" and xray_settings.route_only == "0") and get_domain_excluded() or nil domainsExcluded = (xray_settings.sniffing == "1" and xray_settings.route_only == "0") and get_domain_excluded() or nil
} }
} }

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

@ -691,11 +691,11 @@ msgstr "劫持ICMPv6 (IPv6 PING)"
msgid "Sniffing" msgid "Sniffing"
msgstr "流量嗅探" msgstr "流量嗅探"
msgid "When using the shunt, must be enabled, otherwise the shunt will invalid." msgid "When using the shunt, this option will be forced to be enabled."
msgstr "使用分流时，必须启用，否则分流将无效。" msgstr "使用分流时，将强制启用此选项。"
msgid "Sniffing Route Only" msgid "Sniffing Route Only"
msgstr "流量嗅探只供路由使用" msgstr "流量嗅探仅供路由使用"
msgid "TCP Proxy Way" msgid "TCP Proxy Way"
msgstr "TCP 代理方式" msgstr "TCP 代理方式"

2
patch-luci-app-passwall.patch
View File

@ -145,7 +145,7 @@ index 55bb691..e13625a 100644
s = m:section(NamedSection, arg[1]) s = m:section(NamedSection, arg[1])
s.addremove = false s.addremove = false
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
index 2e2800c..f1a3daf 100644 index 4dd6967..2068b06 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
@@ -11,7 +11,6 @@ local port_validate = function(self, value, t) @@ -11,7 +11,6 @@ local port_validate = function(self, value, t)