Merge pull request #7782 from guggero/fix-tor-dial-ipv6

tor: short circuit host lookup if connecting to IP
This commit is contained in:
Olaoluwa Osuntokun 2023-07-04 12:37:36 -07:00 committed by GitHub
commit f3437d6d2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -220,12 +220,20 @@ func ResolveTCPAddr(address, socksAddr string) (*net.TCPAddr, error) {
return nil, err
}
ip, err := LookupHost(host, socksAddr)
p, err := strconv.Atoi(port)
if err != nil {
return nil, err
}
p, err := strconv.Atoi(port)
// Do we already have an IP? Then we don't need to look up anything.
if ip := net.ParseIP(host); ip != nil {
return &net.TCPAddr{
IP: ip,
Port: p,
}, nil
}
ip, err := LookupHost(host, socksAddr)
if err != nil {
return nil, err
}