fix: don't prefer local ports from other addresses when dialing #1673
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
Stebalien
commented
Aug 12, 2022
| @@ -177,20 +176,13 @@ func testPrefer(t *testing.T, listen, prefer, avoid ma.Multiaddr) { | |||
| } | |||
| defer listenerB1.Close() | |||
|
|
|||
| dialOne(t, &trB, listenerA, listenerB1.Addr().(*net.TCPAddr).Port) | |||
There was a problem hiding this comment.
We now only prefer source ports if the dialing addresses match.
Comment on lines
-12
to
-15
| type dialer interface { | ||
| Dial(network, addr string) (net.Conn, error) | ||
| DialContext(ctx context.Context, network, addr string) (net.Conn, error) | ||
| } |
There was a problem hiding this comment.
We now have one dialer, so there's no need to abstract over them.
p2p/net/reuseport/dialer.go
Outdated
|
|
||
| // DialContext dials a target addr. | ||
| // Dialing preference is | ||
| // * If there is a listener on the local interface the OS expects to use to route towards addr, use that. |
There was a problem hiding this comment.
I have problems parsing this sentence.
p2p/net/reuseport/dialer.go
Outdated
| // DialContext dials a target addr. | ||
| // Dialing preference is | ||
| // * If there is a listener on the local interface the OS expects to use to route towards addr, use that. | ||
| // * If there is a listener on a loopback address, addr is loopback, use that. |
There was a problem hiding this comment.
This one as well, do you mean?
Suggested change
| // * If there is a listener on a loopback address, addr is loopback, use that. | |
| // * If there is a listener on a loopback address and addr is loopback, use that. |
This address may already be in-use (on that other address) somewhere else. Thanks to @schomatis for figuring this out. fixes #1611
|
@marten-seemann done. |
marten-seemann
approved these changes
Aug 19, 2022
nisdas
added a commit
to nisdas/go-libp2p
that referenced
this pull request
Nov 1, 2022
…ng (libp2p#1673)" This reverts commit bbd2836.
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 address may already be in-use (on that other address) somewhere else.
Thanks to @schomatis for figuring this out.
fixes #1611