rosa/hakurei
6
3
Fork 2
Code Issues 10 Pull Requests 3 Actions 2 Packages Projects Releases 15 Wiki Activity

internal/netlink: switch to recvmsg/sendmsg
All checks were successful
Test / Create distribution (push) Successful in 1m15s
Details
Test / Sandbox (push) Successful in 3m6s
Details
Test / Hakurei (push) Successful in 4m13s
Details
Test / ShareFS (push) Successful in 4m20s
Details
Test / Sandbox (race detector) (push) Successful in 5m35s
Details
Test / Hakurei (race detector) (push) Successful in 6m40s
Details
Test / Flake checks (push) Successful in 1m25s
Details

Browse Source 
These are more flexible than recvfrom/sendto.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-03-29 23:34:53 +09:00
parent 19c76e0831
commit 648079f42c
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/netlink/netlink.go
View File

@@ -101,13 +101,13 @@ func (c *Conn) Close() error {
return c.f.Close()
}
// Recvfrom wraps recv(2) with nonblocking behaviour via the runtime network poller.
// Recvmsg wraps recv(2) with nonblocking behaviour via the runtime network poller.
//
// The returned slice is valid until the next call to Recvfrom.
func (c *Conn) Recvfrom(
// The returned slice is valid until the next call to Recvmsg.
func (c *Conn) Recvmsg(
ctx context.Context,
flags int,
) (data []byte, from syscall.Sockaddr, err error) {
) (data []byte, recvflags int, from syscall.Sockaddr, err error) {
if err = c.f.SetReadDeadline(time.Time{}); err != nil {
return
}
@@ -117,7 +117,7 @@ func (c *Conn) Recvfrom(
done := make(chan error, 1)
go func() {
rcErr := c.raw.Read(func(fd uintptr) (done bool) {
n, from, err = syscall.Recvfrom(int(fd), data, flags)
n, _, recvflags, from, err = syscall.Recvmsg(int(fd), data, nil, flags)
return err != syscall.EWOULDBLOCK
})
if n >= 0 {
@@ -129,7 +129,7 @@ func (c *Conn) Recvfrom(
select {
case rcErr := <-done:
if err != nil {
err = os.NewSyscallError("recvfrom", err)
err = os.NewSyscallError("recvmsg", err)
} else {
err = rcErr
}
@@ -147,12 +147,12 @@ func (c *Conn) Recvfrom(
}
}
// Sendto wraps send(2) with nonblocking behaviour via the runtime network poller.
func (c *Conn) Sendto(
// Sendmsg wraps send(2) with nonblocking behaviour via the runtime network poller.
func (c *Conn) Sendmsg(
ctx context.Context,
p []byte,
flags int,
to syscall.Sockaddr,
flags int,
) (err error) {
if err = c.f.SetWriteDeadline(time.Time{}); err != nil {
return
@@ -161,7 +161,7 @@ func (c *Conn) Sendto(
done := make(chan error, 1)
go func() {
done <- c.raw.Write(func(fd uintptr) (done bool) {
err = syscall.Sendto(int(fd), p, flags, to)
err = syscall.Sendmsg(int(fd), p, nil, to, flags)
return err != syscall.EWOULDBLOCK
})
}()
@@ -169,7 +169,7 @@ func (c *Conn) Sendto(
select {
case rcErr := <-done:
if err != nil {
err = os.NewSyscallError("sendto", err)
err = os.NewSyscallError("sendmsg", err)
} else {
err = rcErr
}
@@ -278,7 +278,7 @@ type HandlerFunc func(resp []syscall.NetlinkMessage) error
func (c *Conn) receive(ctx context.Context, f HandlerFunc, flags int) error {
for {
var resp []syscall.NetlinkMessage
if data, _, err := c.Recvfrom(ctx, flags); err != nil {
if data, _, _, err := c.Recvmsg(ctx, flags); err != nil {
return err
} else if len(data) < syscall.NLMSG_HDRLEN {
return syscall.EBADE
@@ -302,9 +302,9 @@ func (c *Conn) Roundtrip(ctx context.Context, f HandlerFunc) error {
}
defer func() { c.seq++ }()
if err := c.Sendto(ctx, c.pending(), 0, &syscall.SockaddrNetlink{
if err := c.Sendmsg(ctx, c.pending(), &syscall.SockaddrNetlink{
Family: syscall.AF_NETLINK,
}); err != nil {
}, 0); err != nil {
return err
}