diff --git a/internal/nodes/http_client_pool_test.go b/internal/nodes/http_client_pool_test.go index 210f894..405483a 100644 --- a/internal/nodes/http_client_pool_test.go +++ b/internal/nodes/http_client_pool_test.go @@ -17,7 +17,7 @@ func TestHTTPClientPool_Client(t *testing.T) { Version: 2, Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"}, } - err := origin.Init(nil) + err := origin.Init(context.Background()) if err != nil { t.Fatal(err) } diff --git a/internal/nodes/listener_base_test.go b/internal/nodes/listener_base_test.go index 5a2ba75..2b75c60 100644 --- a/internal/nodes/listener_base_test.go +++ b/internal/nodes/listener_base_test.go @@ -3,6 +3,7 @@ package nodes import ( + "context" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/types" @@ -23,7 +24,7 @@ func TestBaseListener_FindServer(t *testing.T) { {Name: types.String(i) + ".hello.com"}, }, } - _ = server.Init(nil) + _ = server.Init(context.Background()) listener.Group.Add(server) } diff --git a/internal/utils/byte_pool_test.go b/internal/utils/byte_pool_test.go index d245d59..04c1faf 100644 --- a/internal/utils/byte_pool_test.go +++ b/internal/utils/byte_pool_test.go @@ -61,6 +61,8 @@ func BenchmarkBytePool_Get_Sync(b *testing.B) { return make([]byte, 1024) }, } + + b.ReportAllocs() b.ResetTimer() b.RunParallel(func(pb *testing.PB) { diff --git a/internal/waf/rule.go b/internal/waf/rule.go index 3a6c431..976f9ab 100644 --- a/internal/waf/rule.go +++ b/internal/waf/rule.go @@ -553,11 +553,11 @@ func (this *Rule) Test(value interface{}) bool { return stringutil.VersionCompare(types.String(value), this.Value) >= 0 } case RuleOperatorEqIP: - ip := net.ParseIP(types.String(value)) + var ip = net.ParseIP(types.String(value)) if ip == nil { return false } - return this.isIP && bytes.Equal(this.ipValue, ip) + return this.isIP && ip.Equal(this.ipValue) case RuleOperatorGtIP: ip := net.ParseIP(types.String(value)) if ip == nil {