fix: handle both compressed and uncompressed disconnect reason decoding #6862
Conversation
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
Rjected
added
C-bug
mattsse
approved these changes
Feb 28, 2024
crates/net/eth-wire/src/p2pstream.rs
Outdated
| // over the wire, in both snappy compressed and uncompressed forms. | ||
| // | ||
| // see: | ||
| // <https://github.com/paradigmxyz/reth/blob/790bc62e7bd8f940e7b3ff55c98fa6f5a2b197e9/crates/net/eth-wire/src/disconnect.rs#L251-L261> |
There was a problem hiding this comment.
can we reference the function instead of the blob
Comment on lines
+429
to
+430
| // * snappy compressed, AND | ||
| // * uncompressed |
crates/net/eth-wire/src/p2pstream.rs
Outdated
| @@ -472,6 +485,17 @@ where | |||
| // if we were waiting for a pong, this will reset the pinger state | |||
| this.pinger.on_pong()? | |||
| } | |||
| _ if id == P2PMessageID::Disconnect as u8 => { | |||
| // it's possible we already tried to decode this, but it was snappy compressed, | |||
| // so we need to decode it again | |||
There was a problem hiding this comment.
should mention that this is now snappy decoded
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The following error sometimes shows up on nodes:
The message
c104is a disconnect reason, and it is uncompressed. We send compressed disconnect reasons. However, some other clients send uncompressed disconnect reasons. This adds handling for decoding uncompressed disconnect reasons inP2PStream, along with a test.