Skip to content

Commit 5e35501

Browse files
lightclientzfy0701
authored andcommitted
cmd/utils,p2p: enable discv5 by default (ethereum#30327)
1 parent 677cedb commit 5e35501

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cmd/utils/flags.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,9 @@ var (
807807
DiscoveryV5Flag = &cli.BoolFlag{
808808
Name: "discovery.v5",
809809
Aliases: []string{"discv5"},
810-
Usage: "Enables the experimental RLPx V5 (Topic Discovery) mechanism",
810+
Usage: "Enables the V5 discovery mechanism",
811811
Category: flags.NetworkingCategory,
812+
Value: true,
812813
}
813814
NetrestrictFlag = &cli.StringFlag{
814815
Name: "netrestrict",

p2p/discover/v4_udp.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,9 @@ func (t *UDPv4) readLoop(unhandled chan<- ReadPacket) {
547547
}
548548
return
549549
}
550-
if t.handlePacket(from, buf[:nbytes]) != nil && unhandled != nil {
550+
if err := t.handlePacket(from, buf[:nbytes]); err != nil && unhandled == nil {
551+
t.log.Debug("Bad discv4 packet", "addr", from, "err", err)
552+
} else if err != nil && unhandled != nil {
551553
select {
552554
case unhandled <- ReadPacket{buf[:nbytes], from}:
553555
default:
@@ -564,7 +566,6 @@ func (t *UDPv4) handlePacket(from netip.AddrPort, buf []byte) error {
564566

565567
rawpacket, fromKey, hash, err := v4wire.Decode(buf)
566568
if err != nil {
567-
t.log.Debug("Bad discv4 packet", "addr", from, "err", err)
568569
return err
569570
}
570571
packet := t.wrapPacket(rawpacket)

0 commit comments

Comments
 (0)