netbird/wireguard-go
0
0
Fork 0
mirror of https://github.com/netbirdio/wireguard-go.git synced 2026-05-22 17:08:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Export offload flag for custom receiver

Browse Source
This commit is contained in:
Zoltán Papp
2024-10-30 18:13:35 +01:00
parent 6c340dd55a
commit b7cf0b868b
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conn/bind_std.go
+3 -3
View File
@@ -73,7 +73,7 @@ func NewStdNetBind() Bind {
msgs := make([]ipv6.Message, IdealBatchSize)
for i := range msgs {
msgs[i].Buffers = make(net.Buffers, 1)
msgs[i].OOB = make([]byte, 0, StickyControlSize+gsoControlSize)
msgs[i].OOB = make([]byte, 0, stickyControlSize+gsoControlSize)
}
return &msgs
},
@@ -189,7 +189,7 @@ again:
}
if s.receiverCreator != nil {
// Todo: check if this still works
fns = append(fns, s.receiverCreator.CreateIPv4ReceiverFn(&s.msgsPool, v4pc, v4conn))
fns = append(fns, s.receiverCreator.CreateIPv4ReceiverFn(v4pc, v4conn, s.ipv4RxOffload, &s.msgsPool))
} else {
fns = append(fns, s.makeReceiveIPv4(v4pc, v4conn, s.ipv4RxOffload))
}
@@ -284,7 +284,7 @@ func (s *StdNetBind) receiveIP(
}
addrPort := msg.Addr.(*net.UDPAddr).AddrPort()
ep := &StdNetEndpoint{AddrPort: addrPort} // TODO: remove allocation
GetSrcFromControl(msg.OOB[:msg.NN], ep)
getSrcFromControl(msg.OOB[:msg.NN], ep)
eps[i] = ep
}
return numMsgs, nil
conn/export.go
+12
View File
@@ -0,0 +1,12 @@
package conn
const (
UdpSegmentMaxDatagrams = udpSegmentMaxDatagrams
)
var (
SplitCoalescedMessages = splitCoalescedMessages
GetSrcFromControl = getSrcFromControl
GetGSOSize = getGSOSize
)
conn/receiver_creator.go
+1 -1
View File
@@ -8,5 +8,5 @@ import (
)
type ReceiverCreator interface {
CreateIPv4ReceiverFn(msgPool *sync.Pool, pc *ipv4.PacketConn, conn *net.UDPConn) ReceiveFunc
CreateIPv4ReceiverFn(pc *ipv4.PacketConn, conn *net.UDPConn, rxOffload bool, msgPool *sync.Pool) ReceiveFunc
}
conn/sticky_default.go
+4 -4
View File
@@ -25,9 +25,9 @@ func (e *StdNetEndpoint) SrcToString() string {
// {get,set}srcControl feature set, but use alternatively named flags and need
// ports and require testing.
// GetSrcFromControl parses the control for PKTINFO and if found updates ep with
// getSrcFromControl parses the control for PKTINFO and if found updates ep with
// the source information found.
func GetSrcFromControl(control []byte, ep *StdNetEndpoint) {
func getSrcFromControl(control []byte, ep *StdNetEndpoint) {
}
// setSrcControl parses the control for PKTINFO and if found updates ep with
@@ -35,8 +35,8 @@ func GetSrcFromControl(control []byte, ep *StdNetEndpoint) {
func setSrcControl(control *[]byte, ep *StdNetEndpoint) {
}
// StickyControlSize returns the recommended buffer size for pooling sticky
// stickyControlSize returns the recommended buffer size for pooling sticky
// offloading control data.
const StickyControlSize = 0
const stickyControlSize = 0
const StdNetSupportsStickySockets = false
conn/sticky_linux.go
+4 -4
View File
@@ -45,9 +45,9 @@ func (e *StdNetEndpoint) SrcToString() string {
return e.SrcIP().String()
}
// GetSrcFromControl parses the control for PKTINFO and if found updates ep with
// getSrcFromControl parses the control for PKTINFO and if found updates ep with
// the source information found.
func GetSrcFromControl(control []byte, ep *StdNetEndpoint) {
func getSrcFromControl(control []byte, ep *StdNetEndpoint) {
ep.ClearSrc()
var (
@@ -105,8 +105,8 @@ func setSrcControl(control *[]byte, ep *StdNetEndpoint) {
*control = append(*control, ep.src...)
}
// StickyControlSize returns the recommended buffer size for pooling sticky
// stickyControlSize returns the recommended buffer size for pooling sticky
// offloading control data.
var StickyControlSize = unix.CmsgSpace(unix.SizeofInet6Pktinfo)
var stickyControlSize = unix.CmsgSpace(unix.SizeofInet6Pktinfo)
const StdNetSupportsStickySockets = true
conn/sticky_linux_test.go
+9 -9
View File
@@ -60,7 +60,7 @@ func Test_setSrcControl(t *testing.T) {
}
setSrc(ep, netip.MustParseAddr("127.0.0.1"), 5)
control := make([]byte, StickyControlSize)
control := make([]byte, stickyControlSize)
setSrcControl(&control, ep)
@@ -89,7 +89,7 @@ func Test_setSrcControl(t *testing.T) {
}
setSrc(ep, netip.MustParseAddr("::1"), 5)
control := make([]byte, StickyControlSize)
control := make([]byte, stickyControlSize)
setSrcControl(&control, ep)
@@ -113,7 +113,7 @@ func Test_setSrcControl(t *testing.T) {
})
t.Run("ClearOnNoSrc", func(t *testing.T) {
control := make([]byte, StickyControlSize)
control := make([]byte, stickyControlSize)
hdr := (*unix.Cmsghdr)(unsafe.Pointer(&control[0]))
hdr.Level = 1
hdr.Type = 2
@@ -129,7 +129,7 @@ func Test_setSrcControl(t *testing.T) {
func Test_getSrcFromControl(t *testing.T) {
t.Run("IPv4", func(t *testing.T) {
control := make([]byte, StickyControlSize)
control := make([]byte, stickyControlSize)
hdr := (*unix.Cmsghdr)(unsafe.Pointer(&control[0]))
hdr.Level = unix.IPPROTO_IP
hdr.Type = unix.IP_PKTINFO
@@ -139,7 +139,7 @@ func Test_getSrcFromControl(t *testing.T) {
info.Ifindex = 5
ep := &StdNetEndpoint{}
GetSrcFromControl(control, ep)
getSrcFromControl(control, ep)
if ep.SrcIP() != netip.MustParseAddr("127.0.0.1") {
t.Errorf("unexpected address: %v", ep.SrcIP())
@@ -149,7 +149,7 @@ func Test_getSrcFromControl(t *testing.T) {
}
})
t.Run("IPv6", func(t *testing.T) {
control := make([]byte, StickyControlSize)
control := make([]byte, stickyControlSize)
hdr := (*unix.Cmsghdr)(unsafe.Pointer(&control[0]))
hdr.Level = unix.IPPROTO_IPV6
hdr.Type = unix.IPV6_PKTINFO
@@ -159,7 +159,7 @@ func Test_getSrcFromControl(t *testing.T) {
info.Ifindex = 5
ep := &StdNetEndpoint{}
GetSrcFromControl(control, ep)
getSrcFromControl(control, ep)
if ep.SrcIP() != netip.MustParseAddr("::1") {
t.Errorf("unexpected address: %v", ep.SrcIP())
@@ -173,7 +173,7 @@ func Test_getSrcFromControl(t *testing.T) {
ep := &StdNetEndpoint{}
setSrc(ep, netip.MustParseAddr("::1"), 5)
GetSrcFromControl(control, ep)
getSrcFromControl(control, ep)
if ep.SrcIP().IsValid() {
t.Errorf("unexpected address: %v", ep.SrcIP())
}
@@ -200,7 +200,7 @@ func Test_getSrcFromControl(t *testing.T) {
combined = append(combined, control...)
ep := &StdNetEndpoint{}
GetSrcFromControl(combined, ep)
getSrcFromControl(combined, ep)
if ep.SrcIP() != netip.MustParseAddr("127.0.0.1") {
t.Errorf("unexpected address: %v", ep.SrcIP())