refactor: 移除文件锁和优化节点查询逻辑

core/device/tun_linux.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/netip"
 	"os"
-	"sync"
 	"syscall"
 	"time"
 	"unsafe"
@@ -38,21 +37,14 @@ type tun struct {
 	mtu       int
 	cacheTime time.Time
 	index     int32
-
-	// flock is used for file usage locks
-	flock   sync.Mutex
-	tunFile *os.File
+	tunFile   *os.File
 }
 
 func (t *tun) Read(buff []byte) (int, error) {
-	t.flock.Lock()
-	defer t.flock.Unlock()
 	return t.tunFile.Read(buff)
 }
 
 func (t *tun) Write(buff []byte) (int, error) {
-	t.flock.Lock()
-	defer t.flock.Unlock()
 	return t.tunFile.Write(buff)
 }
 
@@ -83,9 +75,6 @@ func (t *tun) FlushAddress() error {
 }
 
 func (t *tun) getNameFromSys() (string, error) {
-	t.flock.Lock()
-	defer t.flock.Unlock()
-
 	conn, err := t.tunFile.SyscallConn()
 	if err != nil {
 		return "", err

core/engine/engine.go

@@ -287,34 +287,40 @@ func (e *Engine) addConn(dst netip.Addr) (PacketChan, error) {
 
 			dev := &devWrapper{w: e.devWriter, r: peerChan}
 			e.log.Infof(e.ctx, "start find peer %s", string(id))
-			peerc, err := e.discovery.FindPeers(e.ctx, string(id))
+
+			var (
+				stream network.Stream
+				err    error
+			)
+
+			idr, err := base58.Decode(string(id))
 			if err != nil {
-				e.log.Warningf(e.ctx, "Finding node by dht %s failed because %s", string(id), err)
+				e.log.Infof(e.ctx, "base58 decode failed: %s", err)
 			}
 
-			var peers []peer.AddrInfo
-			for info := range peerc {
-				if info.ID.String() == string(id) && len(info.Addrs) > 0 {
-					peers = append(peers, info)
-				}
-			}
-
-			if idr, err := base58.Decode(string(id)); err == nil {
-				info := e.host.Peerstore().PeerInfo(peer.ID(idr))
-				if len(info.Addrs) > 0 {
-					peers = append(peers, info)
-				}
-			}
-
-			var stream network.Stream
-			for _, info := range peers {
-				e.log.Infof(e.ctx, "find peer: %s", info)
+			info := e.host.Peerstore().PeerInfo(peer.ID(idr))
+			if len(info.Addrs) > 0 {
 				stream, err = e.host.NewStream(e.ctx, info.ID, VPNStreamProtocol)
-				if err == nil {
-					break
+				if err != nil {
+					peerc, err := e.discovery.FindPeers(e.ctx, string(id))
+					if err != nil {
+						e.log.Warningf(e.ctx, "Finding node by dht %s failed because %s", string(id), err)
+						return
+					}
+
+					for info := range peerc {
+						if info.ID.String() == string(id) && len(info.Addrs) > 0 {
+							stream, err = e.host.NewStream(e.ctx, info.ID, VPNStreamProtocol)
+							if err == nil {
+								break
+							}
+						}
+					}
+					e.log.Warningf(e.ctx, "Connection establishment with node %s failed", string(id))
+					return
 				}
-				e.log.Warningf(e.ctx, "Connection establishment with node %s failed due to %s", info, err)
 			}
+
 			e.log.Infof(e.ctx, "Peer [%s] connect success", string(id))
 			defer stream.Close()