fix: allow empty IP when decoding Ping's from field #9953
Merged
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
mattsse
requested changes
Jul 31, 2024
crates/net/discv4/Cargo.toml
Outdated
| @@ -31,7 +31,7 @@ secp256k1 = { workspace = true, features = [ | |||
| enr.workspace = true | |||
|
|
|||
| # async/futures | |||
| tokio = { workspace = true, features = ["io-util", "net", "time"] } | |||
| tokio = { workspace = true, features = ["io-util", "net", "time", "rt-multi-thread"] } | |||
There was a problem hiding this comment.
probably not, left over from something being messed up with my setup, for some reason I can't test discv4 without it
crates/net/discv4/src/proto.rs
Outdated
Comment on lines
244
to
261
| impl From<NodeRecord> for PingNodeEndpoint { | ||
| fn from(NodeRecord { address, tcp_port, udp_port, .. }: NodeRecord) -> Self { | ||
| Self(NodeEndpoint { address, tcp_port, udp_port }) | ||
| } | ||
| } | ||
|
|
||
| impl From<NodeEndpoint> for PingNodeEndpoint { | ||
| fn from(value: NodeEndpoint) -> Self { | ||
| Self(value) | ||
| } | ||
| } | ||
|
|
||
| impl PingNodeEndpoint { | ||
| /// Creates a new [`PingNodeEndpoint`] from a given UDP address and TCP port. | ||
| pub const fn from_udp_address(udp_address: &std::net::SocketAddr, tcp_port: u16) -> Self { | ||
| Self(NodeEndpoint { address: udp_address.ip(), udp_port: udp_address.port(), tcp_port }) | ||
| } | ||
| } |
There was a problem hiding this comment.
do we need these?
we only need the .0?
Co-authored-by: Matthias Seitz <[email protected]>
mattsse
approved these changes
Jul 31, 2024
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.
This sets the IP to
UNSPECIFIEDwhen0x80is encountered as aPingpacketfromfield.