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: ace8335083
This commit is contained in:
gitea-action 2025-04-18 22:30:28 +08:00
parent 741691df89
commit 24d2f10e7a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua
View File

@ -27,7 +27,7 @@ local show_node_info = m:get("@global_other[0]", "show_node_info") or "0"
if auto_detection_time ~= "0" then if auto_detection_time ~= "0" then
local node_count = 0 local node_count = 0
for k, e in ipairs(api.get_valid_nodes()) do for k, e in ipairs(api.get_valid_nodes()) do
if e.protocol ~= "_shunt" and e.protocol ~= "_balancing" and e.protocol ~= "_urltest" and e.protocol ~= "_iface" then if e.node_type == "normal" then
node_count = node_count + 1 node_count = node_count + 1
end end
end end
@ -168,8 +168,10 @@ o = s:option(DummyValue, "ping", "Ping")
o.width = "8%" o.width = "8%"
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
local protocol = m:get(n, "protocol") local type = m:get(n, "type") or ""
if protocol == "_shunt" or protocol == "_balancing" or protocol == "_urltest" or protocol == "_iface" then local protocol = m:get(n, "protocol") or ""
if (type == "sing-box" or type == "Xray") and
(protocol == "_shunt" or protocol == "_balancing" or protocol == "_urltest" or protocol == "_iface") then
return string.format('<span class="ping_value" cbiid="%s">---</span>', n) return string.format('<span class="ping_value" cbiid="%s">---</span>', n)
end end
if auto_detection_time ~= "icmp" then if auto_detection_time ~= "icmp" then
@ -184,8 +186,10 @@ o = s:option(DummyValue, "tcping", "TCPing")
o.width = "8%" o.width = "8%"
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
local protocol = m:get(n, "protocol") local type = m:get(n, "type") or ""
if protocol == "_shunt" or protocol == "_balancing" or protocol == "_urltest" or protocol == "_iface" then local protocol = m:get(n, "protocol") or ""
if (type == "sing-box" or type == "Xray") and
(protocol == "_shunt" or protocol == "_balancing" or protocol == "_urltest" or protocol == "_iface") then
return string.format('<span class="tcping_value" cbiid="%s">---</span>', n) return string.format('<span class="tcping_value" cbiid="%s">---</span>', n)
end end
if auto_detection_time ~= "tcping" then if auto_detection_time ~= "tcping" then