intra/tcp.go: don't create TCP endpoint before Dial() returns #149
Conversation
This file contains hidden or 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
|
On the diff, before |
ignoramous
reviewed
Apr 30, 2025
| @@ -270,6 +262,11 @@ func (h *tcpHandler) handle(px ipn.Proxy, src net.Conn, boundSrc, target netip.A | |||
| return err | |||
| } | |||
|
|
|||
| gconn := src.(*netstack.GTCPConn) | |||
| if open, err := gconn.Establish(); !open { | |||
There was a problem hiding this comment.
The check here should be err != nil.
- if open, err := gconn.Establish(); !open {
+ if _, err := gconn.Establish(); err != nil {
+ clos(pc)Code is called in a loop, and so, subsequent Establish() will result in open==false (but err would be nil).
firestack/intra/netstack/tcp.go
Lines 187 to 190 in 4035893
Think I'll have to look more closely on what other changes might be needed to move Establish here.
What is the reason for this change?
There was a problem hiding this comment.
What is the reason for this change?
To complete the experiment in commit b139771
I will play with this draft later.
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.
@ignoramous
I wonder if this change breaks anything.