diff --git a/internal/iplibrary/action_base.go b/internal/iplibrary/action_base.go index 13ac4e7..73cdd3e 100644 --- a/internal/iplibrary/action_base.go +++ b/internal/iplibrary/action_base.go @@ -13,7 +13,7 @@ func (this *BaseAction) Close() error { return nil } -// 处理HTTP请求 +// DoHTTP 处理HTTP请求 func (this *BaseAction) DoHTTP(req *http.Request, resp http.ResponseWriter) (goNext bool, err error) { return true, nil } diff --git a/internal/iplibrary/action_errors.go b/internal/iplibrary/action_errors.go index bb9c430..2c1491c 100644 --- a/internal/iplibrary/action_errors.go +++ b/internal/iplibrary/action_errors.go @@ -1,6 +1,6 @@ package iplibrary -// 是否是致命错误 +// FataError 是否是致命错误 type FataError struct { err string } diff --git a/internal/iplibrary/action_html.go b/internal/iplibrary/action_html.go index 3d167f2..3f7c643 100644 --- a/internal/iplibrary/action_html.go +++ b/internal/iplibrary/action_html.go @@ -6,19 +6,19 @@ import ( "net/http" ) -// HTML动作 +// HTMLAction HTML动作 type HTMLAction struct { BaseAction config *firewallconfigs.FirewallActionHTMLConfig } -// 获取新对象 +// NewHTMLAction 获取新对象 func NewHTMLAction() *HTMLAction { return &HTMLAction{} } -// 初始化 +// Init 初始化 func (this *HTMLAction) Init(config *firewallconfigs.FirewallActionConfig) error { this.config = &firewallconfigs.FirewallActionHTMLConfig{} err := this.convertParams(config.Params, this.config) @@ -28,22 +28,22 @@ func (this *HTMLAction) Init(config *firewallconfigs.FirewallActionConfig) error return nil } -// 添加 +// AddItem 添加 func (this *HTMLAction) AddItem(listType IPListType, item *pb.IPItem) error { return nil } -// 删除 +// DeleteItem 删除 func (this *HTMLAction) DeleteItem(listType IPListType, item *pb.IPItem) error { return nil } -// 关闭 +// Close 关闭 func (this *HTMLAction) Close() error { return nil } -// 处理HTTP请求 +// DoHTTP 处理HTTP请求 func (this *HTMLAction) DoHTTP(req *http.Request, resp http.ResponseWriter) (goNext bool, err error) { if this.config == nil { goNext = true diff --git a/internal/iplibrary/action_interface.go b/internal/iplibrary/action_interface.go index bdd635a..15644aa 100644 --- a/internal/iplibrary/action_interface.go +++ b/internal/iplibrary/action_interface.go @@ -7,18 +7,18 @@ import ( ) type ActionInterface interface { - // 初始化 + // Init 初始化 Init(config *firewallconfigs.FirewallActionConfig) error - // 添加 + // AddItem 添加 AddItem(listType IPListType, item *pb.IPItem) error - // 删除 + // DeleteItem 删除 DeleteItem(listType IPListType, item *pb.IPItem) error - // 关闭 + // Close 关闭 Close() error - // 处理HTTP请求 + // DoHTTP 处理HTTP请求 DoHTTP(req *http.Request, resp http.ResponseWriter) (goNext bool, err error) } diff --git a/internal/iplibrary/action_iptables.go b/internal/iplibrary/action_iptables.go index 1a7d4f0..2ac2f4b 100644 --- a/internal/iplibrary/action_iptables.go +++ b/internal/iplibrary/action_iptables.go @@ -9,11 +9,12 @@ import ( "runtime" ) -// IPTables动作 +// IPTablesAction IPTables动作 // 相关命令: // iptables -A INPUT -s "192.168.2.32" -j ACCEPT // iptables -A INPUT -s "192.168.2.32" -j REJECT -// iptables -D ... +// iptables -D INPUT ... +// iptables -F INPUT type IPTablesAction struct { BaseAction diff --git a/internal/iplibrary/action_script.go b/internal/iplibrary/action_script.go index 227d8e1..83cb786 100644 --- a/internal/iplibrary/action_script.go +++ b/internal/iplibrary/action_script.go @@ -10,7 +10,7 @@ import ( "path/filepath" ) -// 脚本命令动作 +// ScriptAction 脚本命令动作 type ScriptAction struct { BaseAction diff --git a/internal/iplibrary/ip_item.go b/internal/iplibrary/ip_item.go index 4c632ac..344daa4 100644 --- a/internal/iplibrary/ip_item.go +++ b/internal/iplibrary/ip_item.go @@ -28,7 +28,7 @@ func (this *IPItem) Contains(ip uint64) bool { case IPItemTypeIPv6: return this.containsIPv6(ip) case IPItemTypeAll: - return this.containsAll(ip) + return this.containsAll() default: return this.containsIPv4(ip) } @@ -63,7 +63,7 @@ func (this *IPItem) containsIPv6(ip uint64) bool { } // 检查是否包所有IP -func (this *IPItem) containsAll(ip uint64) bool { +func (this *IPItem) containsAll() bool { if this.ExpiredAt > 0 && this.ExpiredAt < utils.UnixTime() { return false }