Extend loopback workaround #140
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
Current workaround for loopback does not allow connecting to the same host when using the public ip. This change extends the workaround to allow for that, unblocking additional use cases pending a larger rework to fully support multiple interfaces.
atreyas
reviewed
Sep 15, 2023
src/net/tcp/stream.rs
Outdated
| @@ -74,7 +74,7 @@ impl TcpStream { | |||
| let rx = host.tcp.new_stream(pair); | |||
|
|
|||
| let syn = Protocol::Tcp(Segment::Syn(Syn { ack })); | |||
| if !dst.ip().is_loopback() { | |||
| if !dst.ip().is_loopback() && dst.ip() != local_addr.ip() { | |||
There was a problem hiding this comment.
Maybe introduce a function that can compare the host for 2 IPs.
mh32
approved these changes
Sep 19, 2023
atreyas
reviewed
Sep 20, 2023
src/host.rs
Outdated
| @@ -417,6 +417,11 @@ pub fn matches(bind: SocketAddr, dst: SocketAddr) -> bool { | |||
| bind == dst | |||
| } | |||
|
|
|||
| /// Returns whether loopback is supported from src to dst | |||
There was a problem hiding this comment.
Technically this is not a loopback. It ends up behaving like loopback because of how turmoil is routing to the local IP address. Mayeb is_same?
mcches
reviewed
Sep 21, 2023
| fn loopback_wildcard_public_v4() -> Result { | ||
| let bind_addr = SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 1234); | ||
| let connect_addr = SocketAddr::from((Ipv4Addr::new(192, 168, 0, 1), 1234)); | ||
| run_localhost_test(IpVersion::V4, bind_addr, connect_addr) |
There was a problem hiding this comment.
Does this verify the stream's addrs are set the same as what tokio::net types return? These need to behave the same way.
There was a problem hiding this comment.
run_localhost_test asserts:
assert_eq!(socket.local_addr()?.ip(), connect_addr.ip());
assert_eq!(socket.peer_addr()?.ip(), connect_addr.ip());
on both server and client.
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 should resolve #135.
Current workaround for loopback from #118 does not allow connecting to the same host when using the public ip. This change extends the workaround to allow for that, unblocking additional use cases pending a larger rework to fully support multiple interfaces (see #132)