Skip to content

refactor(libp2p): use precise connection cleanup in handshake error handling #5330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gacevicljubisa wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −7
Open

refactor(libp2p): use precise connection cleanup in handshake error handling #5330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pkg/p2p/libp2p/libp2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ func (s *Service) handleIncoming(stream network.Stream) {
s.logger.Debug("stream handler: handshake: build remote multiaddrs", "peer_id", peerID, "error", err)
s.logger.Error(nil, "stream handler: handshake: build remote multiaddrs", "peer_id", peerID)
_ = handshakeStream.Reset()
_ = s.host.Network().ClosePeer(peerID)
_ = stream.Conn().Close()
return
}

Expand All @@ -665,7 +665,7 @@ func (s *Service) handleIncoming(stream network.Stream) {
s.logger.Debug("stream handler: handshake: handle failed", "peer_id", peerID, "error", err)
s.logger.Error(nil, "stream handler: handshake: handle failed", "peer_id", peerID)
_ = handshakeStream.Reset()
_ = s.host.Network().ClosePeer(peerID)
_ = stream.Conn().Close()
return
}

Expand Down Expand Up @@ -1066,7 +1066,7 @@ func (s *Service) Connect(ctx context.Context, addrs []ma.Multiaddr) (address *b
peerMultiaddrs, err := s.peerMultiaddrs(ctx, peerID)
if err != nil {
_ = handshakeStream.Reset()
_ = s.host.Network().ClosePeer(peerID)
_ = stream.Conn().Close()
return nil, fmt.Errorf("build peer multiaddrs: %w", err)
}

Expand All @@ -1078,13 +1078,13 @@ func (s *Service) Connect(ctx context.Context, addrs []ma.Multiaddr) (address *b
)
if err != nil {
_ = handshakeStream.Reset()
_ = s.host.Network().ClosePeer(info.ID)
_ = stream.Conn().Close()
return nil, fmt.Errorf("handshake: %w", err)
}

if !i.FullNode {
_ = handshakeStream.Reset()
_ = s.host.Network().ClosePeer(info.ID)
_ = stream.Conn().Close()
return nil, p2p.ErrDialLightNode
}

Expand All @@ -1095,7 +1095,7 @@ func (s *Service) Connect(ctx context.Context, addrs []ma.Multiaddr) (address *b
s.logger.Debug("blocklisting: exists failed", "peer_id", info.ID, "error", err)
s.logger.Error(nil, "internal error while connecting with peer", "peer_id", info.ID)
_ = handshakeStream.Reset()
_ = s.host.Network().ClosePeer(info.ID)
_ = stream.Conn().Close()
return nil, err
}

Expand All @@ -1108,7 +1108,8 @@ func (s *Service) Connect(ctx context.Context, addrs []ma.Multiaddr) (address *b

if exists := s.peers.addIfNotExists(stream.Conn(), overlay, i.FullNode); exists {
if err := handshakeStream.FullClose(); err != nil {
_ = s.Disconnect(overlay, "failed closing handshake stream after connect")
// Only close the new (duplicate) connection; keep existing healthy sessions intact.
_ = stream.Conn().Close()
return nil, fmt.Errorf("peer exists, full close: %w", err)
}

Expand Down
Loading