[client] Handle IPv6 candidates in userspace bind #4123
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
There was a problem hiding this comment.
Pull Request Overview
This PR enhances IPv6 support in the client’s userspace bind by introducing dual-stack packet connections and updating address formatting.
- Extend
LocalAddrto return appropriate IPv4/IPv6 unspecified addresses. - Introduce
DualStackPacketConnand integrate it into UDPMux and ICEBind. - Add
formatEndpointto bracket IPv6 addresses and update ICE candidate logging.
Reviewed Changes
Copilot reviewed 7 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| sharedsock/sock_linux.go | Updated LocalAddr to select IPv4/IPv6/dual-stack addresses |
| go.mod | Bumped WireGuard-Go replacement version |
| client/internal/peer/worker_ice.go | Added formatEndpoint for proper IPv6 bracket formatting |
| client/iface/bind/udp_mux_universal.go | Detect and dispatch to DualStackPacketConn in three paths |
| client/iface/bind/udp_mux.go | Added dual-stack dispatch in writeTo |
| client/iface/bind/ice_bind.go | Refactored receiver creation, multiplex logic for IPv4/IPv6 |
| client/iface/bind/dual_stack_conn.go | New DualStackPacketConn type supporting IPv4 & IPv6 |
Comments suppressed due to low confidence (1)
client/iface/bind/ice_bind.go:256
- The added parameter
isIPv6is never used infilterOutStunMessages, which will cause a compilation error for an unused variable. Either remove this parameter or incorporateisIPv6into the filtering logic.
func (s *ICEBind) filterOutStunMessages(buffers [][]byte, n int, addr net.Addr, isIPv6 bool) (bool, error) {
Comment on lines
128
to
+133
| func (u *udpConn) WriteTo(b []byte, addr net.Addr) (int, error) { | ||
| // Check if this is a dual-stack connection and handle IPv6 addresses properly | ||
| if dualStackConn, ok := u.PacketConn.(*DualStackPacketConn); ok { | ||
| return dualStackConn.WriteTo(b, addr) | ||
| } | ||
|
|
There was a problem hiding this comment.
[nitpick] The dual-stack type assertion and WriteTo logic is duplicated in WriteTo, handleCachedAddress, and handleUncachedAddress. Consider extracting a helper to reduce duplication.
Suggested change
| func (u *udpConn) WriteTo(b []byte, addr net.Addr) (int, error) { | |
| // Check if this is a dual-stack connection and handle IPv6 addresses properly | |
| if dualStackConn, ok := u.PacketConn.(*DualStackPacketConn); ok { | |
| return dualStackConn.WriteTo(b, addr) | |
| } | |
| func (u *udpConn) writeToDualStack(b []byte, addr net.Addr) (int, error) { | |
| if dualStackConn, ok := u.PacketConn.(*DualStackPacketConn); ok { | |
| return dualStackConn.WriteTo(b, addr) | |
| } | |
| return 0, nil | |
| } | |
| func (u *udpConn) WriteTo(b []byte, addr net.Addr) (int, error) { | |
| // Use helper to handle dual-stack connections | |
| if n, err := u.writeToDualStack(b, addr); err != nil || n > 0 { | |
| return n, err | |
| } |
Copilot uses AI. Check for mistakes.
|
pappz
reviewed
Jul 10, 2025
|
|
||
| // ReadFrom reads from both IPv4 and IPv6 connections | ||
| func (d *DualStackPacketConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) { | ||
| // Prefer IPv4 if available |
There was a problem hiding this comment.
Shouldn't we read from both?
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
Stack
Checklist