fix(transport): repair IPv6 support #3793
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
In #3626, we refactored the origin_dst determination logic to utilize socket2 calls. However, this change inadvertently disrupted IPv6 and dual-stack support, causing the server to fail to start when deployed on such network configurations: ``` WARN ThreadId(01) inbound: linkerd_app_core::serve: Server failed to accept connection error=No such file or directory (os error 2) ``` This change reintroduces detection of the current network family, calling socket2's `original_dst()` or `original_dst_ipv6()` depending on the case. Tested fine in both IPv6 and dual-stack Kind clusters.
|
@zaharidichev, tagging you for this—can you test firing it up on Windows? |
olix0r
reviewed
Mar 20, 2025
| }); | ||
|
|
||
| Ok((addr, Box::pin(incoming))) | ||
| } | ||
| } | ||
|
|
||
| fn orig_dst(sock: TcpStream) -> io::Result<(OrigDstAddr, TcpStream)> { |
There was a problem hiding this comment.
can we preserve the orig_dst helper function rather than inlining the whole thing? perhaps passing in the client_addr..
olix0r
approved these changes
Mar 21, 2025
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.
In #3626, we refactored the origin_dst determination logic to utilize socket2 calls. However, this change inadvertently disrupted IPv6 and dual-stack support, causing the server to fail to start when deployed on such network configurations:
This change reintroduces detection of the current network family, calling socket2's
original_dst()ororiginal_dst_ipv6()depending on the case.Tested fine in both IPv6 and dual-stack Kind clusters.