From 7c444a91d3a09f07e30c877dce4c109823b92708 Mon Sep 17 00:00:00 2001
From: wwqgtxx <wwqgtxx@gmail.com>
Date: Mon, 17 Mar 2025 23:51:21 +0800
Subject: [PATCH] fix: correctly handle ipv6 zone

---
 common/net/packet/packet_posix.go   |  6 +++++-
 common/net/packet/packet_windows.go |  6 +++++-
 dns/system_windows.go               | 20 ++++++++++++--------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/common/net/packet/packet_posix.go b/common/net/packet/packet_posix.go
index 2073e35d..8a392887 100644
--- a/common/net/packet/packet_posix.go
+++ b/common/net/packet/packet_posix.go
@@ -45,7 +45,11 @@ func (c *enhanceUDPConn) WaitReadFrom() (data []byte, put func(), addr net.Addr,
 				addr = &net.UDPAddr{IP: ip[:], Port: from.Port}
 			case *syscall.SockaddrInet6:
 				ip := from.Addr // copy from.Addr; ip escapes, so this line allocates 16 bytes
-				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: strconv.FormatInt(int64(from.ZoneId), 10)}
+				zone := ""
+				if from.ZoneId != 0 {
+					zone = strconv.FormatInt(int64(from.ZoneId), 10)
+				}
+				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: zone}
 			}
 		}
 		// udp should not convert readN == 0 to io.EOF
diff --git a/common/net/packet/packet_windows.go b/common/net/packet/packet_windows.go
index 3c467c6d..e6743ee5 100644
--- a/common/net/packet/packet_windows.go
+++ b/common/net/packet/packet_windows.go
@@ -54,7 +54,11 @@ func (c *enhanceUDPConn) WaitReadFrom() (data []byte, put func(), addr net.Addr,
 				addr = &net.UDPAddr{IP: ip[:], Port: from.Port}
 			case *windows.SockaddrInet6:
 				ip := from.Addr // copy from.Addr; ip escapes, so this line allocates 16 bytes
-				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: strconv.FormatInt(int64(from.ZoneId), 10)}
+				zone := ""
+				if from.ZoneId != 0 {
+					zone = strconv.FormatInt(int64(from.ZoneId), 10)
+				}
+				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: zone}
 			}
 		}
 		// udp should not convert readN == 0 to io.EOF
diff --git a/dns/system_windows.go b/dns/system_windows.go
index 2f4d1b63..a86d50ed 100644
--- a/dns/system_windows.go
+++ b/dns/system_windows.go
@@ -3,8 +3,9 @@
 package dns
 
 import (
-	"net"
+	"net/netip"
 	"os"
+	"strconv"
 	"syscall"
 	"unsafe"
 
@@ -23,28 +24,31 @@ func dnsReadConfig() (servers []string, err error) {
 			if err != nil {
 				continue
 			}
-			var ip net.IP
+			var ip netip.Addr
 			switch sa := sa.(type) {
 			case *syscall.SockaddrInet4:
-				ip = net.IPv4(sa.Addr[0], sa.Addr[1], sa.Addr[2], sa.Addr[3])
+				ip = netip.AddrFrom4(sa.Addr)
 			case *syscall.SockaddrInet6:
-				ip = make(net.IP, net.IPv6len)
-				copy(ip, sa.Addr[:])
-				if ip[0] == 0xfe && ip[1] == 0xc0 {
+				if sa.Addr[0] == 0xfe && sa.Addr[1] == 0xc0 {
 					// Ignore these fec0/10 ones. Windows seems to
 					// populate them as defaults on its misc rando
 					// interfaces.
 					continue
 				}
+				ip = netip.AddrFrom16(sa.Addr)
+				if sa.ZoneId != 0 {
+					ip = ip.WithZone(strconv.FormatInt(int64(sa.ZoneId), 10))
+				}
 				//continue
 			default:
 				// Unexpected type.
 				continue
 			}
-			if slices.Contains(servers, ip.String()) {
+			ipStr := ip.String()
+			if slices.Contains(servers, ipStr) {
 				continue
 			}
-			servers = append(servers, ip.String())
+			servers = append(servers, ipStr)
 		}
 	}
 	return