-
Notifications
You must be signed in to change notification settings - Fork 112
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.
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
fix(dot/network): implement a handshake timeout #1615
Merged
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
d5f9107
chore: return the bytes read by leb128
EclesioMeloJunior 74f4b27
feat: add handshake timeout
EclesioMeloJunior fe8a681
Merge branch 'development' into eclesio/handshake-timeout
EclesioMeloJunior 5aac59a
chore: remove debug network loglevel
EclesioMeloJunior e319ec3
Merge branch 'eclesio/handshake-timeout' of github.com:ChainSafe/goss…
EclesioMeloJunior 2d25083
chore: get back to trace
EclesioMeloJunior 00ea2ac
chore: stop ticker no matter the case
EclesioMeloJunior 73b991b
Merge branch 'development' into eclesio/handshake-timeout
EclesioMeloJunior 8c01bf1
chore: implement timer and use unbuffered
EclesioMeloJunior bd23664
Merge branch 'eclesio/handshake-timeout' of github.com:ChainSafe/goss…
EclesioMeloJunior 8ca0824
chore: using defer
EclesioMeloJunior 943b917
Merge branch 'development' into eclesio/handshake-timeout
EclesioMeloJunior cf93011
chore: remove the timer.Stop() when the <-timer.C was called
EclesioMeloJunior 6b405f5
Merge branch 'eclesio/handshake-timeout' of github.com:ChainSafe/goss…
EclesioMeloJunior File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -234,20 +234,20 @@ func (s *Service) sendData(peer peer.ID, hs Handshake, info *notificationsProtoc | |
return | ||
} | ||
|
||
hsTicker := time.NewTicker(handshakeTimeout) | ||
hsTimer := time.NewTimer(handshakeTimeout) | ||
var hs Handshake | ||
|
||
select { | ||
case <-hsTicker.C: | ||
hsTicker.Stop() | ||
case <-hsTimer.C: | ||
hsTimer.Stop() | ||
|
||
logger.Warn("handshake timeout reached", "protocol", info.protocolID, "peer", peer) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. change to trace |
||
_ = stream.Close() | ||
info.outboundHandshakeData.Delete(peer) | ||
return | ||
|
||
case hsResponse := <-s.readHandshake(stream, decodeBlockAnnounceHandshake): | ||
hsTicker.Stop() | ||
hsTimer.Stop() | ||
|
||
if hsResponse.err != nil { | ||
logger.Trace("failed to read handshake", "protocol", info.protocolID, "peer", peer, "error", err) | ||
|
@@ -321,7 +321,7 @@ func (s *Service) broadcastExcluding(info *notificationsProtocol, excluding peer | |
} | ||
|
||
func (s *Service) readHandshake(stream libp2pnetwork.Stream, decoder HandshakeDecoder) <-chan *handshakeReader { | ||
hsC := make(chan *handshakeReader, 1) | ||
hsC := make(chan *handshakeReader) | ||
|
||
go func() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we close |
||
msgBytes := s.bufPool.get() | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can also do
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!