forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/enode: support unspecified IP

Browse source
This commit is contained in:
Felix Lange 2024-05-21 13:43:17 +02:00
parent abef61771d
commit 5d0c8806bc
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
p2p/enode/node.go
View file

@ -83,19 +83,21 @@ func newNodeWithID(r *enr.Record, id ID) *Node {
// validIP reports whether 'ip' is a valid node endpoint IP address. // validIP reports whether 'ip' is a valid node endpoint IP address.
func validIP(ip netip.Addr) bool { func validIP(ip netip.Addr) bool {
return ip.IsValid() && !ip.IsUnspecified() && !ip.IsMulticast() return ip.IsValid() && !ip.IsMulticast()
} }
func localityScore(ip netip.Addr) int { func localityScore(ip netip.Addr) int {
switch { switch {
case ip.IsLoopback(): case ip.IsUnspecified():
return 0 return 0
case ip.IsLinkLocalUnicast(): case ip.IsLoopback():
return 1 return 1
case ip.IsPrivate(): case ip.IsLinkLocalUnicast():
return 2 return 2
default: case ip.IsPrivate():
return 3 return 3
default:
return 4
} }
} }
@ -184,7 +186,7 @@ func (n *Node) TCP() int {
// UDPEndpoint returns the announced TCP endpoint. // UDPEndpoint returns the announced TCP endpoint.
func (n *Node) UDPEndpoint() (netip.AddrPort, bool) { func (n *Node) UDPEndpoint() (netip.AddrPort, bool) {
if !n.ip.IsValid() || n.udp == 0 { if !n.ip.IsValid() || n.ip.IsUnspecified() || n.udp == 0 {
return netip.AddrPort{}, false return netip.AddrPort{}, false
} }
return netip.AddrPortFrom(n.ip, n.udp), true return netip.AddrPortFrom(n.ip, n.udp), true
@ -192,7 +194,7 @@ func (n *Node) UDPEndpoint() (netip.AddrPort, bool) {
// TCPEndpoint returns the announced TCP endpoint. // TCPEndpoint returns the announced TCP endpoint.
func (n *Node) TCPEndpoint() (netip.AddrPort, bool) { func (n *Node) TCPEndpoint() (netip.AddrPort, bool) {
if !n.ip.IsValid() || n.tcp == 0 { if !n.ip.IsValid() || n.ip.IsUnspecified() || n.tcp == 0 {
return netip.AddrPort{}, false return netip.AddrPort{}, false
} }
return netip.AddrPortFrom(n.ip, n.udp), true return netip.AddrPortFrom(n.ip, n.udp), true

19
p2p/enode/node_test.go
View file

@ -107,6 +107,15 @@ func TestNodeEndpoints(t *testing.T) {
}(), }(),
wantIP: netip.MustParseAddr("127.0.0.1"), wantIP: netip.MustParseAddr("127.0.0.1"),
}, },
{
name: "ipv4-only-unspecified",
node: func() *Node {
var r enr.Record
r.Set(enr.IPv4Addr(netip.MustParseAddr("0.0.0.0")))
return SignNull(&r, id)
}(),
wantIP: netip.MustParseAddr("0.0.0.0"),
},
{ {
name: "ipv4-only", name: "ipv4-only",
node: func() *Node { node: func() *Node {
@ -138,6 +147,16 @@ func TestNodeEndpoints(t *testing.T) {
wantIP: netip.MustParseAddr("2001::ff00:0042:8329"), wantIP: netip.MustParseAddr("2001::ff00:0042:8329"),
wantUDP: 30306, wantUDP: 30306,
}, },
{
name: "ipv4-unspecified-and-ipv6-loopback",
node: func() *Node {
var r enr.Record
r.Set(enr.IPv4Addr(netip.MustParseAddr("0.0.0.0")))
r.Set(enr.IPv6Addr(netip.MustParseAddr("::1")))
return SignNull(&r, id)
}(),
wantIP: netip.MustParseAddr("::1"),
},
{ {
name: "ipv4-private-and-ipv6-global", name: "ipv4-private-and-ipv6-global",
node: func() *Node { node: func() *Node {