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

luci-app-passwall2: sync upstream

Browse Source 
last commit: 83e2f6e3c0
This commit is contained in:
gitea-action 2025-04-02 16:00:22 +08:00
parent 32ad2477bb
commit a58776adf8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
View File

@ -364,7 +364,7 @@ o.default = 0
o:depends({ [_n("fallback")] = true }) o:depends({ [_n("fallback")] = true })
]]-- ]]--
o = s:option(DynamicList, _n("fallback_list"), "Fallback", translate("dest,path")) o = s:option(DynamicList, _n("fallback_list"), "Fallback", translate("format: dest,path,xver"))
o:depends({ [_n("fallback")] = true }) o:depends({ [_n("fallback")] = true })
o = s:option(Flag, _n("bind_local"), translate("Bind Local"), translate("When selected, it can only be accessed localhost.")) o = s:option(Flag, _n("bind_local"), translate("Bind Local"), translate("When selected, it can only be accessed localhost."))

8
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -369,19 +369,19 @@ function gen_config_server(node)
local fallbackStr = node.fallback_list[i] local fallbackStr = node.fallback_list[i]
if fallbackStr then if fallbackStr then
local tmp = {} local tmp = {}
string.gsub(fallbackStr, '[^' .. "," .. ']+', function(w) string.gsub(fallbackStr, '[^,]+', function(w)
table.insert(tmp, w) table.insert(tmp, w)
end) end)
local dest = tmp[1] or "" local dest = tmp[1] or ""
local path = tmp[2] local path = tmp[2]
if dest:find("%.") then local xver = tonumber(tmp[3])
else if not dest:find("%.") then
dest = tonumber(dest) dest = tonumber(dest)
end end
fallbacks[i] = { fallbacks[i] = {
path = path, path = path,
dest = dest, dest = dest,
xver = 1 xver = xver
} }
end end
end end

2
luci-app-passwall2/root/usr/share/passwall2/iptables.sh
View File

@ -468,7 +468,7 @@ load_acl() {
$ip6t_m -A PSW2 $(comment "$remarks") ${_ipt_source} -p udp -j RETURN 2>/dev/null $ip6t_m -A PSW2 $(comment "$remarks") ${_ipt_source} -p udp -j RETURN 2>/dev/null
unset ipt_tmp ipt_j _ipt_source msg msg2 unset ipt_tmp ipt_j _ipt_source msg msg2
done done
unset enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface unset enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface write_ipset_direct
unset node_remark _acl_list unset node_remark _acl_list
done done
} }

2
luci-app-passwall2/root/usr/share/passwall2/nftables.sh
View File

@ -519,7 +519,7 @@ load_acl() {
nft "add rule $NFTABLE_NAME PSW2_MANGLE_V6 meta l4proto udp ${_ipt_source} counter return comment \"$remarks\"" 2>/dev/null nft "add rule $NFTABLE_NAME PSW2_MANGLE_V6 meta l4proto udp ${_ipt_source} counter return comment \"$remarks\"" 2>/dev/null
unset nft_chain nft_j _ipt_source msg msg2 unset nft_chain nft_j _ipt_source msg msg2
done done
unset enabled sid remarks sources tcp_proxy_mode udp_proxy_mode tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface unset enabled sid remarks sources tcp_proxy_mode udp_proxy_mode tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface write_ipset_direct
unset redir_port node_remark _acl_list unset redir_port node_remark _acl_list
done done
} }