swarm: use happy eyeballs ranking for TCP dials #2573
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
This was referenced Sep 15, 2023
sukunrt
force-pushed
the
sukun/happy-eyeballs-tcp-4
branch
9 times, most recently
from
9db6917
to
62b878b
Compare
sukunrt
force-pushed
the
sukun/happy-eyeballs-tcp-4
branch
3 times, most recently
from
0bea85f
to
a92d4e7
Compare
|
@marten-seemann Addressed review comments. I'll take webtransport up in a later PR. |
p2p/net/swarm/dial_ranker.go
Outdated
| copy(addrs[2:], addrs[1:i]) | ||
| for j := 1; j < len(addrs); j++ { | ||
| if isQUICAddr(addrs[j]) && isProtocolAddr(addrs[j], ma.P_IP4) { | ||
| // The first IPv4 address is at position i |
There was a problem hiding this comment.
Isn't i always 0 here?
There was a problem hiding this comment.
my bad. This should be j.
| // If the first address is (QUIC, IPv6), make the second address (QUIC, IPv4). | ||
| happyEyeballs := false | ||
| if len(addrs) > 0 { | ||
| // addrs is now sorted by (Transport, IPVersion). Reorder addrs for happy eyeballs dialing. |
There was a problem hiding this comment.
Should this sorting logic be part of score?
There was a problem hiding this comment.
I'm not sure if that'd be more readable. For this ranking we need to look at other addresses, so an IPv4 address gets higher score than other IPv6 addresses only if there are some IPv6 addresses present. I think the present implementation makes the logic explicit.
sukunrt
force-pushed
the
sukun/happy-eyeballs-tcp-4
branch
from
1c0aee3
to
58979d1
Compare
marten-seemann
approved these changes
Oct 19, 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.
The required change is much simpler than my previous tries. Closing other open PRs in favour of this.