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: da49da8f53
This commit is contained in:
actions 2024-07-18 21:00:08 +08:00
parent a34487be30
commit 8eb65c7355
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall2/Makefile
View File

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

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

@ -577,13 +577,7 @@ function gen_config(var)
local xray_settings = uci:get_all(appname, "@global_xray[0]") or {} local xray_settings = uci:get_all(appname, "@global_xray[0]") or {}
local nodes = {} local node = node_id and uci:get_all(appname, node_id) or nil
if node_id then
local node = uci:get_all(appname, node_id)
if node then
nodes[node_id] = node
end
end
local balancers = {} local balancers = {}
local rules = {} local rules = {}
@ -774,12 +768,11 @@ function gen_config(var)
return default_outTag return default_outTag
end end
for k, v in pairs(nodes) do if node then
if server_host and server_port then if server_host and server_port then
v.address = server_host node.address = server_host
v.port = server_port node.port = server_port
end end
local node = v
if node.protocol == "_shunt" then if node.protocol == "_shunt" then
local proxy_tag = "main" local proxy_tag = "main"
local proxy_node_id = node["main_node"] local proxy_node_id = node["main_node"]