forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 14:33:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: update lib of utp

Browse source
This commit is contained in:
thinkAfCod 2023-10-30 12:19:31 +08:00
parent bf12305507
commit adfd669e40
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
p2p/discover/portal_protocol.go
View file

@ -78,6 +78,7 @@ type PortalProtocol struct {
nodeRadius *uint256.Int nodeRadius *uint256.Int
DiscV5 *UDPv5 DiscV5 *UDPv5
utp *utp.Listener utp *utp.Listener
utpPackets chan *utp.UdpMessage
ListenAddr string ListenAddr string
localNode *enode.LocalNode localNode *enode.LocalNode
log log.Logger log log.Logger
@ -128,6 +129,7 @@ func (p *PortalProtocol) Start() error {
} }
p.DiscV5.RegisterTalkHandler(p.protocolId, p.handleTalkRequest) p.DiscV5.RegisterTalkHandler(p.protocolId, p.handleTalkRequest)
p.DiscV5.RegisterTalkHandler(portalwire.UTPNetwork, p.handleUtpTalkRequest)
go p.table.loop() go p.table.loop()
return nil return nil
@ -156,7 +158,26 @@ func (p *PortalProtocol) setupUDPListening() (*net.UDPConn, error) {
// } // }
//} //}
p.utp, err = utp.ListenUTP("udp", (*utp.Addr)(laddr)) p.utpPackets = make(chan *utp.UdpMessage, 10)
p.utp, err = utp.ListenUTPOptions("utp", (*utp.Addr)(laddr), utp.WithCustomHandler(
func(buf []byte, addr *net.UDPAddr) (int, error) {
var a [32]byte
// todo need to find enode.ID by addr
_, err := p.DiscV5.TalkRequestToID(a, addr, portalwire.UTPNetwork, buf)
return 0, err
},
func() ([]byte, *net.UDPAddr, error) {
select {
case msg := <-p.utpPackets:
if msg != nil {
return msg.Buf, msg.Addr, nil
} else {
return nil, nil, errClosed
}
}
},
))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -287,6 +308,14 @@ func (p *PortalProtocol) processPong(target *enode.Node, resp []byte) (uint64, e
return pong.EnrSeq, nil return pong.EnrSeq, nil
} }
func (p *PortalProtocol) handleUtpTalkRequest(id enode.ID, addr *net.UDPAddr, msg []byte) []byte {
if node := p.DiscV5.getNode(id); node != nil {
p.table.addSeenNode(wrapNode(node))
}
p.utpPackets <- &utp.UdpMessage{Buf: msg, Addr: addr}
return []byte("")
}
func (p *PortalProtocol) handleTalkRequest(id enode.ID, addr *net.UDPAddr, msg []byte) []byte { func (p *PortalProtocol) handleTalkRequest(id enode.ID, addr *net.UDPAddr, msg []byte) []byte {
if node := p.DiscV5.getNode(id); node != nil { if node := p.DiscV5.getNode(id); node != nil {
p.table.addSeenNode(wrapNode(node)) p.table.addSeenNode(wrapNode(node))