Avoid using custom dialers for proxy when not mobile #2229
Closed
+13
−23
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
|
lixmal
reviewed
Jul 3, 2024
| if runtime.GOOS == "ios" || runtime.GOOS == "android" { | ||
| p.localConn, err = nbnet.NewDialer().DialContext(p.ctx, "udp", fmt.Sprintf(":%d", p.localWGListenPort)) | ||
| } else { | ||
| p.localConn, err = net.Dial("udp", fmt.Sprintf(":%d", p.localWGListenPort)) |
There was a problem hiding this comment.
Can we use DialContext here regardless?
| @@ -72,10 +73,10 @@ func (p *WGEBPFProxy) listen() error { | |||
|
|
|||
| addr := net.UDPAddr{ | |||
| Port: wgPorxyPort, | |||
| IP: net.ParseIP("127.0.0.1"), | |||
| IP: net.ParseIP(loopbackIPv4Addres), | |||
There was a problem hiding this comment.
Maybe something like net.IP{127, 0, 0, 1} is a bit better here.
| err = nbnet.SetSocketOpt(fd) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("setting fwmark failed: %w", err) | ||
| } |
There was a problem hiding this comment.
This is the only block that should be removed. The other stuff should stay, we should still check if os.NewFile returns nil.
| @@ -35,7 +36,11 @@ func (p *WGUserSpaceProxy) AddTurnConn(turnConn net.Conn) (net.Addr, error) { | |||
| p.remoteConn = turnConn | |||
|
|
|||
| var err error | |||
| p.localConn, err = nbnet.NewDialer().DialContext(p.ctx, "udp", fmt.Sprintf(":%d", p.localWGListenPort)) | |||
| if runtime.GOOS == "ios" || runtime.GOOS == "android" { | |||
There was a problem hiding this comment.
This should be android only, iOS already calls net.Dial underneath anyway. I'm not sure about Android either, it likely has 127.0.0.0/8 in the local table as well, so there might be no need to protect the socket there.
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.
Describe your changes
Issue ticket number and link
Checklist