forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p/enode: simplify parseComplete

Browse source
This commit is contained in:
Felix Lange 2019-08-22 11:18:18 +02:00 committed by GitHub
parent 9040b4c284
commit 7a21dc1265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
p2p/enode/urlv4.go
View file

@ -119,25 +119,17 @@ func parseComplete(rawurl string) (*Node, error) {
return nil, fmt.Errorf("invalid node ID (%v)", err) return nil, fmt.Errorf("invalid node ID (%v)", err)
} }
// Parse the IP address. // Parse the IP address.
host, port, err := net.SplitHostPort(u.Host) ips, err := net.LookupIP(u.Hostname())
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid host: %v", err) return nil, err
}
if ip = net.ParseIP(host); ip == nil {
// attempt to look up IP addresses if host is a FQDN
lookupIPs, err := net.LookupIP(host)
if err != nil {
return nil, errors.New("invalid IP address")
}
// set to first ip by default
ip = lookupIPs[0]
} }
ip := ips[0]
// Ensure the IP is 4 bytes long for IPv4 addresses. // Ensure the IP is 4 bytes long for IPv4 addresses.
if ipv4 := ip.To4(); ipv4 != nil { if ipv4 := ip.To4(); ipv4 != nil {
ip = ipv4 ip = ipv4
} }
// Parse the port numbers. // Parse the port numbers.
if tcpPort, err = strconv.ParseUint(port, 10, 16); err != nil { if tcpPort, err = strconv.ParseUint(u.Port(), 10, 16); err != nil {
return nil, errors.New("invalid port") return nil, errors.New("invalid port")
} }
udpPort = tcpPort udpPort = tcpPort