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

luci-app-passwall2: sync upstream

Browse Source
This commit is contained in:
actions 2024-03-20 16:00:09 +08:00
parent 5357134acd
commit 67b7c79ebb
2 changed files with 3 additions and 3 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.28-3 PKG_VERSION:=1.28-4
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

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

@ -630,7 +630,7 @@ socks_node_switch() {
local port=$(config_n_get $flag port) local port=$(config_n_get $flag port)
local config_file="SOCKS_${flag}.json" local config_file="SOCKS_${flag}.json"
local log_file="SOCKS_${flag}.log" 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="" [ "$log" == "0" ] && log_file=""
local http_port=$(config_n_get $flag http_port 0) local http_port=$(config_n_get $flag http_port 0)
local http_config_file="HTTP2SOCKS_${flag}.json" local http_config_file="HTTP2SOCKS_${flag}.json"
@ -725,7 +725,7 @@ start_socks() {
local port=$(config_n_get $id port) local port=$(config_n_get $id port)
local config_file="SOCKS_${id}.json" local config_file="SOCKS_${id}.json"
local log_file="SOCKS_${id}.log" 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="" [ "$log" == "0" ] && log_file=""
local http_port=$(config_n_get $id http_port 0) local http_port=$(config_n_get $id http_port 0)
local http_config_file="HTTP2SOCKS_${id}.json" local http_config_file="HTTP2SOCKS_${id}.json"