fix(s2n-quic-transport): fix client connection migration when local address handle changes #1874
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
camshaft
force-pushed
the
camshaft/client-migration-fix
branch
from
47e3528
to
298e423
Compare
camshaft
force-pushed
the
camshaft/client-migration-fix
branch
from
298e423
to
2457fd5
Compare
camshaft
force-pushed
the
camshaft/client-migration-fix
branch
from
2457fd5
to
8dc45ef
Compare
|
This change breaks the interop tests. Marking as draft for now. |
camshaft
force-pushed
the
camshaft/client-migration-fix
branch
from
ea30846
to
a2045a3
Compare
|
Should be fixed now |
quic/s2n-quic-core/src/path/mod.rs
Outdated
| @@ -250,6 +258,11 @@ impl Handle for Tuple { | |||
| self.local_address = other.local_address; | |||
| } | |||
| } | |||
|
|
|||
| #[inline] | |||
There was a problem hiding this comment.
would it also work if you just changed maybe_update to something like:
fn maybe_update(&mut self, other: &Self) {
if self.local_address.port() != other.local_address.port() {
self.local_address = other.local_address;
}
}There was a problem hiding this comment.
yeah that's probably cleaner; although we should probably check that other.port() != 0, just to make sure we're not accidentally clearing information
| fn eq_by_handle(&self, handle: &Config::PathHandle) -> bool { | ||
| if self.handle.local_address().port() == 0 { | ||
| if Config::ENDPOINT_TYPE.is_client() || self.handle.local_address().port() == 0 { | ||
| // Only compare the remote address if we haven't updated the local yet |
There was a problem hiding this comment.
I'll just remove this one since it's documented as part of the function above
camshaft
force-pushed
the
camshaft/client-migration-fix
branch
from
a2045a3
to
b6127c2
Compare
quic/s2n-quic-core/src/path/mod.rs
Outdated
| return; | ||
| } | ||
|
|
||
| // once we discover our path, or the port changes, update the address full address |
There was a problem hiding this comment.
I know its just copy-pasted, but update the address full address isn't making sense to me grammatically
There was a problem hiding this comment.
i should have more carefully read it 😄. i'll fix it
camshaft
force-pushed
the
camshaft/client-migration-fix
branch
from
b6127c2
to
cf29aed
Compare
WesleyRosenblum
approved these changes
Aug 11, 2023
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.
Description of changes:
There's a bit of an issue on the client with matching incoming packets to stored paths in the case of connection migration. If the local address changes, we end up rejecting the server's packet and the connection times out. You can see this issue by removing the fix and running the integration test.
The fix, instead, finds paths based on the server's address alone and then updates the local address if it has changed.
Testing:
I've included an integration test showing path migration working with this change.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.