Skip to content

fix(dot/network): close notifications streams #2093

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

Merged
kishansagathiya merged 6 commits into from
Dec 14, 2021
Merged

fix(dot/network): close notifications streams #2093

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0d5710
fix(dot/network): close notifications streams
kishansagathiya Dec 1, 2021
dd13d6b
Merge branch 'development' into kishan/fix/notification
kishansagathiya Dec 1, 2021
4113f42
Update dot/network/notifications.go
kishansagathiya Dec 10, 2021
801c1b2
Addressed reviews
kishansagathiya Dec 10, 2021
eb76a33
Merge branch 'kishan/fix/notification' of github.com:ChainSafe/gossam…
kishansagathiya Dec 10, 2021
8fd7aa9
Merge branch 'development' into kishan/fix/notification
kishansagathiya Dec 14, 2021
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
20 changes: 15 additions & 5 deletions dot/network/notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@ func createDecoder(info *notificationsProtocol, handshakeDecoder HandshakeDecode
}

// createNotificationsMessageHandler returns a function that is called by the handler of *inbound* streams.
func (s *Service) createNotificationsMessageHandler(info *notificationsProtocol,
messageHandler NotificationsMessageHandler,
batchHandler NotificationsMessageBatchHandler) messageHandler {
func (s *Service) createNotificationsMessageHandler(
info *notificationsProtocol,
notificationsMessageHandler NotificationsMessageHandler,
batchHandler NotificationsMessageBatchHandler,
) messageHandler {
return func(stream libp2pnetwork.Stream, m Message) error {
if m == nil || info == nil || info.handshakeValidator == nil || messageHandler == nil {
if m == nil || info == nil || info.handshakeValidator == nil || notificationsMessageHandler == nil {
return nil
}

Expand Down Expand Up @@ -214,6 +216,10 @@ func (s *Service) createNotificationsMessageHandler(info *notificationsProtocol,
}

logger.Tracef("receiver: sent handshake to peer %s using protocol %s", peer, info.protocolID)

if err := stream.CloseWrite(); err != nil {
logger.Tracef("failed to close stream for writing: %s", err)
}
}

return nil
Expand All @@ -227,7 +233,7 @@ func (s *Service) createNotificationsMessageHandler(info *notificationsProtocol,
return nil
}

propagate, err := messageHandler(peer, msg)
propagate, err := notificationsMessageHandler(peer, msg)
if err != nil {
return err
}
Expand Down Expand Up @@ -380,6 +386,10 @@ func (s *Service) sendHandshake(peer peer.ID, hs Handshake, info *notificationsP
hsData.received = true
}

if err := stream.CloseRead(); err != nil {
logger.Tracef("failed to close stream for reading: %s", err)
}

if err = info.handshakeValidator(peer, resp); err != nil {
logger.Tracef("failed to validate handshake from peer %s using protocol %s: %s", peer, info.protocolID, err)
hsData.validated = false
Expand Down