forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove raw packet of trace log

Browse source
This commit is contained in:
thinkAfCod 2025-05-15 21:25:37 +08:00 committed by Chen Kai
parent aa62418193
commit 0fa5150d7a
1 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
p2p/discover/v5_udp.go
View file

@ -30,7 +30,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/common/mclock"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/discover/v5wire" "github.com/ethereum/go-ethereum/p2p/discover/v5wire"
@ -768,11 +767,10 @@ func (t *UDPv5) send(toID enode.ID, toAddr netip.AddrPort, packet v5wire.Packet,
return nonce, err return nonce, err
} }
t.logcontext = append(t.logcontext, "rawpacket", hexutil.Encode(enc))
t.log.Trace(">> "+packet.Name(), t.logcontext...) t.log.Trace(">> "+packet.Name(), t.logcontext...)
dataForSend := bufferpool.Get(len(enc))[:0] dataForSend := make([]byte, len(enc))
dataForSend = append(dataForSend, enc...) copy(dataForSend, enc)
pw := pendingWrite{ pw := pendingWrite{
toAddr: toAddr, toAddr: toAddr,
@ -784,7 +782,6 @@ func (t *UDPv5) send(toID enode.ID, toAddr netip.AddrPort, packet v5wire.Packet,
// Packet successfully queued. // Packet successfully queued.
return nonce, nil return nonce, nil
case <-t.closeCtx.Done(): case <-t.closeCtx.Done():
bufferpool.Put(dataForSend)
return nonce, errClosed return nonce, errClosed
} }
} }
@ -808,13 +805,7 @@ func (t *UDPv5) writeLoop() {
t.log.Warn("UDP write error", "addr", pw.toAddr, "err", err) t.log.Warn("UDP write error", "addr", pw.toAddr, "err", err)
} }
} }
} else {
// Minimal trace log confirming the actual send.
// The detailed packet-specific trace was done in the 'send' method.
t.log.Trace("UDP packet data sent", "addr", pw.toAddr, "len", len(pw.data))
} }
bufferpool.Put(pw.data)
} }
} }
@ -822,12 +813,8 @@ func (t *UDPv5) writeLoop() {
func (t *UDPv5) readLoop() { func (t *UDPv5) readLoop() {
defer t.wg.Done() defer t.wg.Done()
for {
select {
case <-t.closeCtx.Done():
t.log.Trace("UDP read loop shutdown")
default:
buf := bufferpool.Get(maxPacketSize) buf := bufferpool.Get(maxPacketSize)
for {
nbytes, from, err := t.conn.ReadFromUDPAddrPort(buf) nbytes, from, err := t.conn.ReadFromUDPAddrPort(buf)
if netutil.IsTemporaryError(err) { if netutil.IsTemporaryError(err) {
// Ignore temporary read errors. // Ignore temporary read errors.
@ -843,7 +830,6 @@ func (t *UDPv5) readLoop() {
t.dispatchReadPacket(from, buf[:nbytes]) t.dispatchReadPacket(from, buf[:nbytes])
} }
} }
}
// dispatchReadPacket sends a packet into the dispatch loop. // dispatchReadPacket sends a packet into the dispatch loop.
func (t *UDPv5) dispatchReadPacket(from netip.AddrPort, content []byte) bool { func (t *UDPv5) dispatchReadPacket(from netip.AddrPort, content []byte) bool {
@ -851,11 +837,12 @@ func (t *UDPv5) dispatchReadPacket(from netip.AddrPort, content []byte) bool {
if from.Addr().Is4In6() { if from.Addr().Is4In6() {
from = netip.AddrPortFrom(netip.AddrFrom4(from.Addr().As4()), from.Port()) from = netip.AddrPortFrom(netip.AddrFrom4(from.Addr().As4()), from.Port())
} }
data := make([]byte, len(content))
copy(data, content)
select { select {
case t.packetInCh <- ReadPacket{content, from}: case t.packetInCh <- ReadPacket{data, from}:
return true return true
case <-t.closeCtx.Done(): case <-t.closeCtx.Done():
bufferpool.Put(content)
return false return false
} }
} }
@ -863,9 +850,7 @@ func (t *UDPv5) dispatchReadPacket(from netip.AddrPort, content []byte) bool {
// handlePacket decodes and processes an incoming packet from the network. // handlePacket decodes and processes an incoming packet from the network.
func (t *UDPv5) handlePacket(rawpacket []byte, fromAddr netip.AddrPort) error { func (t *UDPv5) handlePacket(rawpacket []byte, fromAddr netip.AddrPort) error {
addr := fromAddr.String() addr := fromAddr.String()
t.log.Trace("<< "+addr, "rawPacket", hexutil.Encode(rawpacket))
fromID, fromNode, packet, err := t.codec.Decode(rawpacket, addr) fromID, fromNode, packet, err := t.codec.Decode(rawpacket, addr)
bufferpool.Put(rawpacket)
if err != nil { if err != nil {
if t.unhandled != nil && v5wire.IsInvalidHeader(err) { if t.unhandled != nil && v5wire.IsInvalidHeader(err) {