LumeWeb
/
libs5-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: switch to EndForAbuse

This commit is contained in:
Derrick Hammer 2024-01-15 13:37:49 -05:00
parent 944067522a
commit c2ab3b4651
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
service/p2p.go
View File

@ -213,7 +213,7 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee
p.incomingIPBlocklist.Put(fromPeerIP, true) p.incomingIPBlocklist.Put(fromPeerIP, true)
blocked = true blocked = true
} }
err = fromPeer.End() err = fromPeer.EndForAbuse()
if err != nil { if err != nil {
return err return err
} }
@ -272,7 +272,7 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee
p.incomingIPBlocklist.Put(fromPeerIP, true) p.incomingIPBlocklist.Put(fromPeerIP, true)
blocked = true blocked = true
} }
err = fromPeer.End() err = fromPeer.EndForAbuse()
if err != nil { if err != nil {
return err return err
} }
@ -329,7 +329,7 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee
go func() { go func() {
err := p.OnNewPeer(peer, true) err := p.OnNewPeer(peer, true)
if err != nil { if err != nil && !peer.Abused() {
p.logger.Error("peer error", zap.Error(err)) p.logger.Error("peer error", zap.Error(err))
} }
p.Node().ConnectionTracker().Done() p.Node().ConnectionTracker().Done()
@ -354,7 +354,7 @@ func (p *P2PImpl) OnNewPeer(peer net.Peer, verifyId bool) error {
if p.incomingIPBlocklist.Contains(pid) { if p.incomingIPBlocklist.Contains(pid) {
p.logger.Error("peer is on identity blocklist", zap.String("peer", pid)) p.logger.Error("peer is on identity blocklist", zap.String("peer", pid))
err := peer.End() err := peer.EndForAbuse()
if err != nil { if err != nil {
return err return err
} }
@ -362,7 +362,7 @@ func (p *P2PImpl) OnNewPeer(peer net.Peer, verifyId bool) error {
} }
if p.incomingPeerBlockList.Contains(pip) { if p.incomingPeerBlockList.Contains(pip) {
p.logger.Debug("peer is on ip blocklist", zap.String("peer", pid), zap.String("ip", pip)) p.logger.Debug("peer is on ip blocklist", zap.String("peer", pid), zap.String("ip", pip))
err := peer.End() err := peer.EndForAbuse()
if err != nil { if err != nil {
return err return err
} }