Merge branch 'dev' into Alpha

This commit is contained in:
gVisor bot 2022-06-17 21:44:54 +08:00
commit e254066c76

View file

@ -173,7 +173,7 @@ func ResolveAllIPv4WithResolver(host string, r Resolver) ([]netip.Addr, error) {
ip, err := netip.ParseAddr(host) ip, err := netip.ParseAddr(host)
if err == nil { if err == nil {
if ip.Is4() { if ip.Is4() || ip.Is4In6() {
return []netip.Addr{ip}, nil return []netip.Addr{ip}, nil
} }
return []netip.Addr{}, ErrIPVersion return []netip.Addr{}, ErrIPVersion