优化代码

internal/nodes/client_conn.go

@@ -17,7 +17,6 @@ import (
 	"net"
 	"os"
 	"strings"
-	"sync"
 	"sync/atomic"
 	"time"
 )
@@ -26,8 +25,6 @@ import (
 type ClientConn struct {
 	BaseClientConn
 
-	once sync.Once
-
 	isTLS       bool
 	hasDeadline bool
 	hasRead     bool

internal/nodes/http_request.go

@@ -1444,8 +1444,6 @@ func (this *HTTPRequest) Close() {
 		_ = conn.Close()
 		return
 	}
-
-	return
 }
 
 // Allow 放行

internal/nodes/listener.go

@@ -15,9 +15,8 @@ import (
 )
 
 type Listener struct {
-	group       *serverconfigs.ServerAddressGroup
-	isListening bool
-	listener    ListenerInterface // 监听器
+	group    *serverconfigs.ServerAddressGroup
+	listener ListenerInterface // 监听器
 
 	locker sync.RWMutex
 }

internal/nodes/listener_base.go

@@ -182,23 +182,3 @@ func (this *BaseListener) findNamedServerMatched(name string) (serverConfig *ser
 
 	return nil, name
 }
-
-// 使用CNAME来查找服务
-// TODO 防止单IP随机生成域名攻击
-func (this *BaseListener) findServerWithCNAME(domain string) *serverconfigs.ServerConfig {
-	if !sharedNodeConfig.SupportCNAME {
-		return nil
-	}
-
-	var realName = sharedCNAMEManager.Lookup(domain)
-	if len(realName) == 0 {
-		return nil
-	}
-
-	group := this.Group
-	if group == nil {
-		return nil
-	}
-
-	return group.MatchServerCNAME(realName)
-}

internal/nodes/server_cname_manager.go

@@ -1,48 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package nodes
-
-import (
-	"github.com/TeaOSLab/EdgeNode/internal/ttlcache"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
-	"github.com/iwind/TeaGo/types"
-	"strings"
-	"sync"
-	"time"
-)
-
-var sharedCNAMEManager = NewServerCNAMEManager()
-
-// ServerCNAMEManager 服务CNAME管理
-// TODO 需要自动更新缓存里的记录
-type ServerCNAMEManager struct {
-	ttlCache *ttlcache.Cache
-
-	locker sync.Mutex
-}
-
-func NewServerCNAMEManager() *ServerCNAMEManager {
-	return &ServerCNAMEManager{
-		ttlCache: ttlcache.NewCache(),
-	}
-}
-
-func (this *ServerCNAMEManager) Lookup(domain string) string {
-	if len(domain) == 0 {
-		return ""
-	}
-
-	var item = this.ttlCache.Read(domain)
-	if item != nil {
-		return types.String(item.Value)
-	}
-
-	cname, _ := utils.LookupCNAME(domain)
-	if len(cname) > 0 {
-		cname = strings.TrimSuffix(cname, ".")
-	}
-
-	this.ttlCache.Write(domain, cname, time.Now().Unix()+600)
-
-	return cname
-}

internal/nodes/server_cname_manager_test.go

@@ -1,19 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package nodes
-
-import (
-	"testing"
-	"time"
-)
-
-func TestServerCNameManager_Lookup(t *testing.T) {
-	var cnameManager = NewServerCNAMEManager()
-	t.Log(cnameManager.Lookup("www.yun4s.cn"))
-
-	var before = time.Now()
-	defer func() {
-		t.Log(time.Since(before).Seconds()*1000, "ms")
-	}()
-	t.Log(cnameManager.Lookup("www.yun4s.cn"))
-}