OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2024-05-10 12:20:14

This commit is contained in:
kenzok8 2024-05-10 12:20:14 +08:00
parent 11fc9c1805
commit 5ff6b359e9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -767,8 +767,8 @@ function gen_config(var)
end end
if node.protocol == "_shunt" then if node.protocol == "_shunt" then
local proxy_node_id = node["main_node"] local proxy_tag = node.preproxy_enabled == "1" and "main" or nil
local proxy_tag = "main" local proxy_node_id = proxy_tag and node["main_node"] or nil
local proxy_balancer_tag local proxy_balancer_tag
local proxy_nodes local proxy_nodes
@ -862,7 +862,6 @@ function gen_config(var)
end end
return outbound_tag, nil return outbound_tag, nil
elseif _node.protocol == "_balancing" then elseif _node.protocol == "_balancing" then
return nil, gen_balancer(_node, rule_name) return nil, gen_balancer(_node, rule_name)
elseif _node.protocol == "_iface" then elseif _node.protocol == "_iface" then
if _node.iface then if _node.iface then
@ -884,7 +883,7 @@ function gen_config(var)
end end
--proxy_node --proxy_node
if node.preproxy_enabled == "1" and proxy_node_id then if proxy_tag and proxy_node_id then
local proxy_outbound_tag local proxy_outbound_tag
proxy_outbound_tag, proxy_balancer_tag = gen_shunt_node(proxy_tag, proxy_node_id) proxy_outbound_tag, proxy_balancer_tag = gen_shunt_node(proxy_tag, proxy_node_id)
if proxy_balancer_tag then if proxy_balancer_tag then

4
quickstart/Makefile
View File

@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
PKG_ARCH_quickstart:=$(ARCH) PKG_ARCH_quickstart:=$(ARCH)
PKG_NAME:=quickstart PKG_NAME:=quickstart
PKG_VERSION:=0.8.13 PKG_VERSION:=0.8.14
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/ PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/
PKG_HASH:=2b1974b75f43bb01d25fb9a7d21695c9e0f5a80297fdcfc51215cc4f6cbfe985 PKG_HASH:=287d60f90d7df57e325dee417166bf5eb6e05cf6089fd3ef6e1111f2fe896cf6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)