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

Revert "fix: utp send call to maintain nonce"

Browse source 
This reverts commit c6aa362ebb.
This commit is contained in:
Chen Kai 2024-10-11 23:05:14 +08:00
parent 3297426e1c
commit 8955d0b309
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p2p/discover/portal_protocol.go
View file

@ -326,7 +326,7 @@ func (p *PortalProtocol) setupUDPListening() error {
if id, ok := p.cachedIds[addr.String()]; ok {
//_, err := p.DiscV5.TalkRequestToID(id, addr, string(portalwire.UTPNetwork), buf)
req := &v5wire.TalkRequest{Protocol: string(portalwire.Utp), Message: buf}
p.DiscV5.sendFromAnotherThreadWithCall(id, netip.AddrPortFrom(netutil.IPToAddr(addr.IP), uint16(addr.Port)), req)
p.DiscV5.sendFromAnotherThread(id, netip.AddrPortFrom(netutil.IPToAddr(addr.IP), uint16(addr.Port)), req)
return len(buf), err
} else {

5
p2p/discover/v5_udp.go
View file

@ -686,11 +686,6 @@ func (t *UDPv5) sendFromAnotherThread(toID enode.ID, toAddr netip.AddrPort, pack
}
}
func (t *UDPv5) sendFromAnotherThreadWithCall(toID enode.ID, toAddr netip.AddrPort, packet v5wire.Packet) {
resp := t.callToID(toID, toAddr, v5wire.TalkRequestMsg, packet)
defer t.callDone(resp)
}
// send sends a packet to the given node.
func (t *UDPv5) send(toID enode.ID, toAddr netip.AddrPort, packet v5wire.Packet, c *v5wire.Whoareyou) (v5wire.Nonce, error) {
addr := toAddr.String()