From 4100824c436885844564c5ad081967b4cfedc920 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 16 Jan 2023 23:39:16 +0800 Subject: [PATCH] Update firewall_api.py --- class/core/firewall_api.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py index 111ae2225..b8ab4958a 100755 --- a/class/core/firewall_api.py +++ b/class/core/firewall_api.py @@ -471,7 +471,13 @@ class firewall_api: if data[0].strip() == 'inactive': return False return True - if self.__isFirewalld: + elif self.__isIptables: + cmd = "systemctl status iptables | grep 'inactive'" + data = mw.execShell(cmd) + if data[0] != '': + return False + return True + elif self.__isFirewalld: cmd = "ps -ef|grep firewalld |grep -v grep | awk '{print $2}'" data = mw.execShell(cmd) if data[0] == '': @@ -480,8 +486,4 @@ class firewall_api: elif self.__isMac: return False else: - cmd = "systemctl status iptables | grep 'inactive'" - data = mw.execShell(cmd) - if data[0] != '': - return False - return True + return False