From 8955d0b309e978b811d39955df72f784254a2d1b Mon Sep 17 00:00:00 2001 From: Chen Kai <281165273grape@gmail.com> Date: Fri, 11 Oct 2024 23:05:14 +0800 Subject: [PATCH] Revert "fix: utp send call to maintain nonce" This reverts commit c6aa362ebbac6d2c4c080c515ca5e757c224cd11. --- p2p/discover/portal_protocol.go | 2 +- p2p/discover/v5_udp.go | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/p2p/discover/portal_protocol.go b/p2p/discover/portal_protocol.go index 4a94a0822d9e..b974aab2b0a4 100644 --- a/p2p/discover/portal_protocol.go +++ b/p2p/discover/portal_protocol.go @@ -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 { diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index 8240f4106c74..d4d9a054d9f1 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -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()