diff --git a/internal/iplibrary/action_firewalld.go b/internal/iplibrary/action_firewalld.go index 866f898..c57148d 100644 --- a/internal/iplibrary/action_firewalld.go +++ b/internal/iplibrary/action_firewalld.go @@ -11,7 +11,7 @@ import ( "time" ) -// Firewalld动作管理 +// FirewalldAction Firewalld动作管理 // 常用命令: // - 查询列表: firewall-cmd --list-all // - 添加IP:firewall-cmd --add-rich-rule="rule family='ipv4' source address='192.168.2.32' reject" --timeout=30s @@ -126,10 +126,12 @@ func (this *FirewalldAction) runActionSingleIP(action string, listType IPListTyp } args := []string{opt} - if item.ExpiredAt > timestamp { - args = append(args, "--timeout="+fmt.Sprintf("%d", item.ExpiredAt-timestamp)+"s") - } else { - // TODO 思考是否需要permanent,不然--reload之后会丢失 + if action == "addItem" { + if item.ExpiredAt > timestamp { + args = append(args, "--timeout="+fmt.Sprintf("%d", item.ExpiredAt-timestamp)+"s") + } else { + // TODO 思考是否需要permanent,不然--reload之后会丢失 + } } if runtime.GOOS == "darwin" { diff --git a/internal/iplibrary/action_ipset.go b/internal/iplibrary/action_ipset.go index e6b76b3..1110f75 100644 --- a/internal/iplibrary/action_ipset.go +++ b/internal/iplibrary/action_ipset.go @@ -11,7 +11,7 @@ import ( "time" ) -// IPSet动作 +// IPSetAction IPSet动作 // 相关命令: // - 利用Firewalld管理set: // - 添加:firewall-cmd --permanent --new-ipset=edge_ip_list --type=hash:ip --option="timeout=0"