Skip to content

Commit e86a494

Browse files
committed
change code in LookupNetIP rather than AddrFromSlice
1 parent 6186106 commit e86a494

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/net/lookup.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,11 @@ func (r *Resolver) LookupNetIP(ctx context.Context, network, host string) ([]net
255255
}
256256
ret := make([]netip.Addr, 0, len(ips))
257257
for _, ip := range ips {
258-
if a, ok := netip.AddrFromSlice(ip); ok {
259-
ret = append(ret, a)
258+
a, err := netip.ParseAddr(ip.String())
259+
if err != nil {
260+
continue
260261
}
262+
ret = append(ret, a)
261263
}
262264
return ret, nil
263265
}

src/net/netip/netip.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,7 @@ func AddrFromSlice(slice []byte) (ip Addr, ok bool) {
354354
case 4:
355355
return AddrFrom4(*(*[4]byte)(slice)), true
356356
case 16:
357-
ipAddr := ipv6Slice(slice)
358-
unwrapAddr := ipAddr.Unmap()
359-
return unwrapAddr, true
357+
return ipv6Slice(slice), true
360358
}
361359
return Addr{}, false
362360
}

0 commit comments

Comments
 (0)