mirror/mihomo
1
1
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2025-12-19 16:30:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: simplify resolveUDPAddr

Browse Source
This commit is contained in:
wwqgtxx 2025-09-09 08:38:50 +08:00
parent b27325eed0
commit 1d09ed82f1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
adapter/outbound/util.go
View File

@ -39,6 +39,14 @@ func resolveUDPAddr(ctx context.Context, network, address string, prefer C.DNSPr
if err != nil { if err != nil {
return nil, err return nil, err
} }
var uint16Port uint16
if port, err := strconv.ParseUint(port, 10, 16); err == nil {
uint16Port = uint16(port)
} else {
return nil, err
}
var ip netip.Addr var ip netip.Addr
switch prefer { switch prefer {
case C.IPv4Only: case C.IPv4Only:
@ -56,7 +64,10 @@ func resolveUDPAddr(ctx context.Context, network, address string, prefer C.DNSPr
} }
ip, port = resolver.LookupIP4P(ip, port) ip, port = resolver.LookupIP4P(ip, port)
return net.ResolveUDPAddr(network, net.JoinHostPort(ip.String(), port)) // our resolver always unmap before return, so unneeded unmap at here
// which is different with net.ResolveUDPAddr maybe return 4in6 address
// 4in6 addresses can cause some strange effects on sing-based code
return net.UDPAddrFromAddrPort(netip.AddrPortFrom(ip, uint16Port)), nil
} }
func safeConnClose(c net.Conn, err error) { func safeConnClose(c net.Conn, err error) {