From 67b7c79ebb2d73245d60b33e96a3cda04f37972c Mon Sep 17 00:00:00 2001 From: actions Date: Wed, 20 Mar 2024 16:00:09 +0800 Subject: [PATCH] luci-app-passwall2: sync upstream --- luci-app-passwall2/Makefile | 2 +- luci-app-passwall2/root/usr/share/passwall2/app.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index e74f07891..f95b63a85 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 -PKG_VERSION:=1.28-3 +PKG_VERSION:=1.28-4 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/root/usr/share/passwall2/app.sh b/luci-app-passwall2/root/usr/share/passwall2/app.sh index 2755c4610..6d00dd2ca 100644 --- a/luci-app-passwall2/root/usr/share/passwall2/app.sh +++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh @@ -630,7 +630,7 @@ socks_node_switch() { local port=$(config_n_get $flag port) local config_file="SOCKS_${flag}.json" local log_file="SOCKS_${flag}.log" - local log=$(config_n_get $id log 1) + local log=$(config_n_get $flag log 1) [ "$log" == "0" ] && log_file="" local http_port=$(config_n_get $flag http_port 0) local http_config_file="HTTP2SOCKS_${flag}.json" @@ -725,7 +725,7 @@ start_socks() { local port=$(config_n_get $id port) local config_file="SOCKS_${id}.json" local log_file="SOCKS_${id}.log" - local log=$(config_n_get $flag log 1) + local log=$(config_n_get $id log 1) [ "$log" == "0" ] && log_file="" local http_port=$(config_n_get $id http_port 0) local http_config_file="HTTP2SOCKS_${id}.json"