-
-
Notifications
You must be signed in to change notification settings - Fork 812
[client] Handle IPv6 candidates in userspace bind #4123
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
lixmal
wants to merge
3
commits into
main
Choose a base branch
from
bind-ipv6
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package bind | ||
|
|
||
| import ( | ||
| "errors" | ||
| "net" | ||
| "time" | ||
|
|
||
| "github.com/hashicorp/go-multierror" | ||
|
|
||
| nberrors "github.com/netbirdio/netbird/client/errors" | ||
| ) | ||
|
|
||
| var ( | ||
| errNoIPv4Conn = errors.New("no IPv4 connection available") | ||
| errNoIPv6Conn = errors.New("no IPv6 connection available") | ||
| errInvalidAddr = errors.New("invalid address type") | ||
| ) | ||
|
|
||
| // DualStackPacketConn is a composite PacketConn that can handle both IPv4 and IPv6 | ||
| type DualStackPacketConn struct { | ||
| ipv4Conn net.PacketConn | ||
| ipv6Conn net.PacketConn | ||
| } | ||
|
|
||
| // NewDualStackPacketConn creates a new dual-stack packet connection | ||
| func NewDualStackPacketConn(ipv4Conn, ipv6Conn net.PacketConn) *DualStackPacketConn { | ||
| return &DualStackPacketConn{ | ||
| ipv4Conn: ipv4Conn, | ||
| ipv6Conn: ipv6Conn, | ||
| } | ||
| } | ||
|
|
||
| // 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 | ||
| if d.ipv4Conn != nil { | ||
| return d.ipv4Conn.ReadFrom(b) | ||
| } | ||
| if d.ipv6Conn != nil { | ||
| return d.ipv6Conn.ReadFrom(b) | ||
| } | ||
| return 0, nil, net.ErrClosed | ||
| } | ||
|
|
||
| // WriteTo writes to the appropriate connection based on the address type | ||
| func (d *DualStackPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { | ||
| udpAddr, ok := addr.(*net.UDPAddr) | ||
| if !ok { | ||
| return 0, &net.OpError{ | ||
| Op: "write", | ||
| Net: "udp", | ||
| Addr: addr, | ||
| Err: errInvalidAddr, | ||
| } | ||
| } | ||
|
|
||
| if udpAddr.IP.To4() == nil { | ||
| if d.ipv6Conn != nil { | ||
| return d.ipv6Conn.WriteTo(b, addr) | ||
| } | ||
| return 0, &net.OpError{ | ||
| Op: "write", | ||
| Net: "udp6", | ||
| Addr: addr, | ||
| Err: errNoIPv6Conn, | ||
| } | ||
| } | ||
|
|
||
| if d.ipv4Conn != nil { | ||
| return d.ipv4Conn.WriteTo(b, addr) | ||
| } | ||
| return 0, &net.OpError{ | ||
| Op: "write", | ||
| Net: "udp4", | ||
| Addr: addr, | ||
| Err: errNoIPv4Conn, | ||
| } | ||
| } | ||
|
|
||
| // Close closes both connections | ||
| func (d *DualStackPacketConn) Close() error { | ||
| var result *multierror.Error | ||
| if d.ipv4Conn != nil { | ||
| if err := d.ipv4Conn.Close(); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| if d.ipv6Conn != nil { | ||
| if err := d.ipv6Conn.Close(); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| return nberrors.FormatErrorOrNil(result) | ||
| } | ||
|
|
||
| // LocalAddr returns the local address of the IPv4 connection (for compatibility) | ||
| func (d *DualStackPacketConn) LocalAddr() net.Addr { | ||
| if d.ipv4Conn != nil { | ||
| return d.ipv4Conn.LocalAddr() | ||
| } | ||
| if d.ipv6Conn != nil { | ||
| return d.ipv6Conn.LocalAddr() | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // SetDeadline sets the deadline for both connections | ||
| func (d *DualStackPacketConn) SetDeadline(t time.Time) error { | ||
| var result *multierror.Error | ||
| if d.ipv4Conn != nil { | ||
| if err := d.ipv4Conn.SetDeadline(t); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| if d.ipv6Conn != nil { | ||
| if err := d.ipv6Conn.SetDeadline(t); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| return nberrors.FormatErrorOrNil(result) | ||
| } | ||
|
|
||
| // SetReadDeadline sets the read deadline for both connections | ||
| func (d *DualStackPacketConn) SetReadDeadline(t time.Time) error { | ||
| var result *multierror.Error | ||
| if d.ipv4Conn != nil { | ||
| if err := d.ipv4Conn.SetReadDeadline(t); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| if d.ipv6Conn != nil { | ||
| if err := d.ipv6Conn.SetReadDeadline(t); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| return nberrors.FormatErrorOrNil(result) | ||
| } | ||
|
|
||
| // SetWriteDeadline sets the write deadline for both connections | ||
| func (d *DualStackPacketConn) SetWriteDeadline(t time.Time) error { | ||
| var result *multierror.Error | ||
| if d.ipv4Conn != nil { | ||
| if err := d.ipv4Conn.SetWriteDeadline(t); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| if d.ipv6Conn != nil { | ||
| if err := d.ipv6Conn.SetWriteDeadline(t); err != nil { | ||
| result = multierror.Append(result, err) | ||
| } | ||
| } | ||
| return nberrors.FormatErrorOrNil(result) | ||
| } | ||
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -126,6 +126,11 @@ type udpConn struct { | |||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| 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) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
|
Comment on lines
128
to
+133
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [nitpick] The dual-stack type assertion and
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||||||||||||||||||||||||||||||||
| if u.filterFn == nil { | ||||||||||||||||||||||||||||||||||||
| return u.PacketConn.WriteTo(b, addr) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
@@ -141,13 +146,23 @@ func (u *udpConn) handleCachedAddress(isRouted bool, b []byte, addr net.Addr) (i | |||||||||||||||||||||||||||||||||||
| if isRouted { | ||||||||||||||||||||||||||||||||||||
| return 0, fmt.Errorf("address %s is part of a routed network, refusing to write", addr) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| if dualStackConn, ok := u.PacketConn.(*DualStackPacketConn); ok { | ||||||||||||||||||||||||||||||||||||
| return dualStackConn.WriteTo(b, addr) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| return u.PacketConn.WriteTo(b, addr) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| func (u *udpConn) handleUncachedAddress(b []byte, addr net.Addr) (int, error) { | ||||||||||||||||||||||||||||||||||||
| if err := u.performFilterCheck(addr); err != nil { | ||||||||||||||||||||||||||||||||||||
| return 0, err | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| if dualStackConn, ok := u.PacketConn.(*DualStackPacketConn); ok { | ||||||||||||||||||||||||||||||||||||
| return dualStackConn.WriteTo(b, addr) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
| return u.PacketConn.WriteTo(b, addr) | ||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we read from both?