mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-24 08:49:29 +00:00
cmd/utils,p2p: enable discv5 by default (#30327)
This commit is contained in:
parent
3c37db7989
commit
00294e9d28
2 changed files with 5 additions and 3 deletions
|
|
@ -807,8 +807,9 @@ var (
|
||||||
DiscoveryV5Flag = &cli.BoolFlag{
|
DiscoveryV5Flag = &cli.BoolFlag{
|
||||||
Name: "discovery.v5",
|
Name: "discovery.v5",
|
||||||
Aliases: []string{"discv5"},
|
Aliases: []string{"discv5"},
|
||||||
Usage: "Enables the experimental RLPx V5 (Topic Discovery) mechanism",
|
Usage: "Enables the V5 discovery mechanism",
|
||||||
Category: flags.NetworkingCategory,
|
Category: flags.NetworkingCategory,
|
||||||
|
Value: true,
|
||||||
}
|
}
|
||||||
NetrestrictFlag = &cli.StringFlag{
|
NetrestrictFlag = &cli.StringFlag{
|
||||||
Name: "netrestrict",
|
Name: "netrestrict",
|
||||||
|
|
|
||||||
|
|
@ -547,7 +547,9 @@ func (t *UDPv4) readLoop(unhandled chan<- ReadPacket) {
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if t.handlePacket(from, buf[:nbytes]) != nil && unhandled != nil {
|
if err := t.handlePacket(from, buf[:nbytes]); err != nil && unhandled == nil {
|
||||||
|
t.log.Debug("Bad discv4 packet", "addr", from, "err", err)
|
||||||
|
} else if err != nil && unhandled != nil {
|
||||||
select {
|
select {
|
||||||
case unhandled <- ReadPacket{buf[:nbytes], from}:
|
case unhandled <- ReadPacket{buf[:nbytes], from}:
|
||||||
default:
|
default:
|
||||||
|
|
@ -564,7 +566,6 @@ func (t *UDPv4) handlePacket(from netip.AddrPort, buf []byte) error {
|
||||||
|
|
||||||
rawpacket, fromKey, hash, err := v4wire.Decode(buf)
|
rawpacket, fromKey, hash, err := v4wire.Decode(buf)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.log.Debug("Bad discv4 packet", "addr", from, "err", err)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
packet := t.wrapPacket(rawpacket)
|
packet := t.wrapPacket(rawpacket)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue