TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-11 13:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化iptables+firewall-cmd找不到时的提示

Browse Source
This commit is contained in:
刘祥超
2021-11-15 09:45:03 +08:00
parent 9ac7b9b2c0
commit 5a6ead1dd7
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/iplibrary/action_firewalld.go
View File

@@ -20,6 +20,8 @@ type FirewalldAction struct {
BaseAction BaseAction
config *firewallconfigs.FirewallActionFirewalldConfig config *firewallconfigs.FirewallActionFirewalldConfig
firewalldNotFound bool
} }
func NewFirewalldAction() *FirewalldAction { func NewFirewalldAction() *FirewalldAction {
@@ -82,6 +84,10 @@ func (this *FirewalldAction) runActionSingleIP(action string, listType IPListTyp
if len(path) == 0 { if len(path) == 0 {
path, err = exec.LookPath("firewall-cmd") path, err = exec.LookPath("firewall-cmd")
if err != nil { if err != nil {
if this.firewalldNotFound {
return nil
}
this.firewalldNotFound = true
return err return err
} }
} }

6
internal/iplibrary/action_iptables.go
View File

@@ -19,6 +19,8 @@ type IPTablesAction struct {
BaseAction BaseAction
config *firewallconfigs.FirewallActionIPTablesConfig config *firewallconfigs.FirewallActionIPTablesConfig
iptablesNotFound bool
} }
func NewIPTablesAction() *IPTablesAction { func NewIPTablesAction() *IPTablesAction {
@@ -77,6 +79,10 @@ func (this *IPTablesAction) runActionSingleIP(action string, listType IPListType
if len(path) == 0 { if len(path) == 0 {
path, err = exec.LookPath("iptables") path, err = exec.LookPath("iptables")
if err != nil { if err != nil {
if this.iptablesNotFound {
return nil
}
this.iptablesNotFound = true
return err return err
} }
} }