mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2025-03-13 11:35:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge 829dfa822e into bb52d7d78d

Browse source
This commit is contained in:
Eugene 2025-02-17 10:06:24 +01:00 • committed by GitHub
commit aa7e1fd32b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
connmgr/tor.go
View file

@ -106,24 +106,39 @@ func TorLookupIP(host, proxy string) ([]net.IP, error) {
}
return nil, ErrTorInvalidProxyResponse
}
if buf[3] != 1 {
addr := make([]net.IP, 1)
switch buf[3] {
case 1:
buf = make([]byte, 4)
bytes, err := conn.Read(buf)
if err != nil {
return nil, err
}
if bytes != 4 {
return nil, ErrTorInvalidAddressResponse
}
r := binary.BigEndian.Uint32(buf)
addr[0] = net.IPv4(byte(r>>24), byte(r>>16), byte(r>>8), byte(r))
case 4:
buf = make([]byte, 16)
bytes, err := conn.Read(buf)
if err != nil {
return nil, err
}
if bytes != 16 {
return nil, ErrTorInvalidAddressResponse
}
addr[0] = net.IP(buf)
default:
// Not IPv4 or IPv6.
err := torStatusErrors[torGeneralError]
return nil, err
}
buf = make([]byte, 4)
bytes, err := conn.Read(buf)
if err != nil {
return nil, err
}
if bytes != 4 {
return nil, ErrTorInvalidAddressResponse
}
r := binary.BigEndian.Uint32(buf)
addr := make([]net.IP, 1)
addr[0] = net.IPv4(byte(r>>24), byte(r>>16), byte(r>>8), byte(r))
return addr, nil
}