chore: adjust logic

tunnel/tunnel.go

@@ -3,7 +3,6 @@ package tunnel
 import (
 	"context"
 	"fmt"
-	"math/rand"
 	"net"
 	"net/netip"
 	"path/filepath"
@@ -202,13 +201,9 @@ func preHandleMetadata(metadata *C.Metadata) error {
 			if resolver.FakeIPEnabled() {
 				metadata.DstIP = netip.Addr{}
 				metadata.DNSMode = C.DNSFakeIP
-			} else if node := resolver.DefaultHosts.Search(host); node != nil {
+			} else if node, ok := resolver.DefaultHosts.Search(host, false); ok {
 				// redir-host should lookup the hosts
-				if !node.Data().IsDomain {
-					metadata.DstIP,_ = node.Data().RandIP()
-				} else {
-					metadata.Host = node.Data().Domain
-				}
+				metadata.DstIP, _ = node.RandIP()
 			}
 		} else if resolver.IsFakeIP(metadata.DstIP) {
 			return fmt.Errorf("fake DNS record %s missing", metadata.DstIP)
@@ -397,14 +392,11 @@ func handleTCPConn(connCtx C.ConnContext) {
 
 	dialMetadata := metadata
 	if len(metadata.Host) > 0 {
-		if node := resolver.DefaultHosts.Search(metadata.Host); node != nil {
-			hostValue := node.Data()
-			if !hostValue.IsDomain {
-				if dstIp, _ := hostValue.RandIP(); !FakeIPRange().Contains(dstIp) {
-					dialMetadata.DstIP = dstIp
-					dialMetadata.DNSMode = C.DNSHosts
-					dialMetadata = dialMetadata.Pure()
-				}
+		if node, ok := resolver.DefaultHosts.Search(metadata.Host, false); ok {
+			if dstIp, _ := node.RandIP(); !FakeIPRange().Contains(dstIp) {
+				dialMetadata.DstIP = dstIp
+				dialMetadata.DNSMode = C.DNSHosts
+				dialMetadata = dialMetadata.Pure()
 			}
 		}
 	}
@@ -506,12 +498,9 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
 		processFound bool
 	)
 
-	if node := resolver.DefaultHosts.Search(metadata.Host); node != nil {
-		if !node.Data().IsDomain {
-			metadata.DstIP = node.Data().IPs[rand.Intn(len(node.Data().IPs)-1)]
-			resolved = true
-		}
-
+	if node, ok := resolver.DefaultHosts.Search(metadata.Host, false); ok {
+		metadata.DstIP, _ = node.RandIP()
+		resolved = true
 	}
 
 	for _, rule := range getRules(metadata) {