From a82438b0c65b0202e44d7ff822b173cef800ad36 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Mon, 9 Dec 2024 22:30:19 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/4ac543d7f647fdc516d8af971a4c77af67309f8f --- luci-app-passwall/luasrc/controller/passwall.lua | 4 ++-- patch-luci-app-passwall.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua index a6a2eefe3..a3b132b43 100644 --- a/luci-app-passwall/luasrc/controller/passwall.lua +++ b/luci-app-passwall/luasrc/controller/passwall.lua @@ -217,11 +217,11 @@ function index_status() if dns_shunt == "smartdns" then e.dns_mode_status = luci.sys.call("pidof smartdns >/dev/null") == 0 elseif dns_shunt == "chinadns-ng" then - local port = string.match(luci.sys.exec("cat /tmp/etc/passwall/acl/default/chinadns_ng.conf"), "bind%-port%s*(%d+)") or "65353" - e.dns_mode_status = luci.sys.call(string.format("netstat -apn | grep ':%s ' >/dev/null", port)) == 0 + e.dns_mode_status = luci.sys.call("/bin/busybox top -bn1 | grep -v 'grep' | grep '/tmp/etc/passwall/bin/' | grep 'default' | grep 'chinadns_ng' >/dev/null") == 0 else e.dns_mode_status = luci.sys.call("netstat -apn | grep ':15353 ' >/dev/null") == 0 end + e.haproxy_status = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v grep | grep '%s/bin/' | grep haproxy >/dev/null", appname)) == 0 e["tcp_node_status"] = luci.sys.call("/bin/busybox top -bn1 | grep -v 'grep' | grep '/tmp/etc/passwall/bin/' | grep 'default' | grep 'TCP' >/dev/null") == 0 diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 55646a822..e58975834 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -20,7 +20,7 @@ index fa1cd41..eac8656 100644 define Package/$(PKG_NAME)/postrm diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua -index 58c7d1a..a6a2eef 100644 +index ce89a37..a3b132b 100644 --- a/luci-app-passwall/luasrc/controller/passwall.lua +++ b/luci-app-passwall/luasrc/controller/passwall.lua @@ -274,7 +274,7 @@ function connect_status()