forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-24 08:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 6bb35af2b0 into 12eabbd76d

Browse source
This commit is contained in:
rayoo 2026-05-21 21:53:44 -07:00 committed by GitHub
commit d6d900a650
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
p2p/discover/v4_udp.go
View file

@ -355,7 +355,10 @@ func (t *UDPv4) findnode(toid enode.ID, toAddrPort netip.AddrPort, target v4wire
// RequestENR sends ENRRequest to the given node and waits for a response.
func (t *UDPv4) RequestENR(n *enode.Node) (*enode.Node, error) {
addr, _ := n.UDPEndpoint()
addr, ok := n.UDPEndpoint()
if !ok {
return nil, errNoUDPEndpoint
}
t.ensureBond(n.ID(), addr)
req := &v4wire.ENRRequest{

17
p2p/discover/v4_udp_test.go
View file

@ -158,6 +158,23 @@ func TestUDPv4_pingTimeout(t *testing.T) {
}
}
// TestUDPv4_RequestENRNoUDPEndpoint verifies that RequestENR returns a clean
// errNoUDPEndpoint error for a node without a usable UDP endpoint, instead of
// silently sending a packet to the zero address and waiting for a timeout.
// This mirrors the existing guards in ping/Ping/findnode.
func TestUDPv4_RequestENRNoUDPEndpoint(t *testing.T) {
t.Parallel()
test := newUDPTest(t)
defer test.close()
key := newkey()
// UDP port 0 makes UDPEndpoint return ok=false.
node := enode.NewV4(&key.PublicKey, net.ParseIP("1.2.3.4"), 2222, 0)
if _, err := test.udp.RequestENR(node); err != errNoUDPEndpoint {
t.Errorf("expected errNoUDPEndpoint, got %v", err)
}
}
type testPacket byte
func (req testPacket) Kind() byte { return byte(req) }