kat/hakurei
1
0
Fork 0
forked from rosa/hakurei
Code Pull Requests Activity

internal/netlink: optional check header as reply

Browse Source 
Not every received message is a reply.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-03-25 19:33:01 +09:00
parent 372d509e5c
commit 722c3cc54f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/netlink/netlink.go
View File

@@ -232,6 +232,14 @@ func (e *InconsistentError) Error() string {
return s return s
} }
// checkReply checks the message header of a reply from the kernel.
func (c *conn) checkReply(header *syscall.NlMsghdr) error {
if header.Seq != c.seq || header.Pid != c.port {
return &InconsistentError{*header, c.seq, c.port}
}
return nil
}
// pending returns the valid slice of buf and initialises pos. // pending returns the valid slice of buf and initialises pos.
func (c *conn) pending() []byte { func (c *conn) pending() []byte {
buf := c.buf[:c.pos] buf := c.buf[:c.pos]
@@ -275,12 +283,6 @@ func (c *conn) receive(ctx context.Context, f HandlerFunc, flags int) error {
return err return err
} }
for i := range resp {
header := &resp[i].Header
if header.Seq != c.seq || header.Pid != c.port {
return &InconsistentError{*header, c.seq, c.port}
}
}
if err = f(resp); err != nil { if err = f(resp); err != nil {
if err == (Complete{}) { if err == (Complete{}) {
return nil return nil

12
internal/netlink/rtnl.go
View File

@@ -19,8 +19,12 @@ func DialRoute() (*RouteConn, error) {
} }
// rtnlConsume consumes a message from rtnetlink. // rtnlConsume consumes a message from rtnetlink.
func rtnlConsume(resp []syscall.NetlinkMessage) error { func (c *conn) rtnlConsume(resp []syscall.NetlinkMessage) error {
for i := range resp { for i := range resp {
if err := c.checkReply(&resp[i].Header); err != nil {
return err
}
switch resp[i].Header.Type { switch resp[i].Header.Type {
case syscall.NLMSG_DONE: case syscall.NLMSG_DONE:
return Complete{} return Complete{}
@@ -81,7 +85,7 @@ func (c *RouteConn) SendIfAddrmsg(
if !c.writeIfAddrmsg(typ, flags, msg, attrs...) { if !c.writeIfAddrmsg(typ, flags, msg, attrs...) {
return syscall.ENOMEM return syscall.ENOMEM
} }
return c.Roundtrip(ctx, rtnlConsume) return c.Roundtrip(ctx, c.conn.rtnlConsume)
} }
// writeNewaddrLo writes a RTM_NEWADDR message for the loopback address. // writeNewaddrLo writes a RTM_NEWADDR message for the loopback address.
@@ -110,7 +114,7 @@ func (c *RouteConn) SendNewaddrLo(ctx context.Context, lo uint32) error {
if !c.writeNewaddrLo(lo) { if !c.writeNewaddrLo(lo) {
return syscall.ENOMEM return syscall.ENOMEM
} }
return c.Roundtrip(ctx, rtnlConsume) return c.Roundtrip(ctx, c.conn.rtnlConsume)
} }
// writeIfInfomsg writes an ifinfomsg structure to conn. // writeIfInfomsg writes an ifinfomsg structure to conn.
@@ -131,5 +135,5 @@ func (c *RouteConn) SendIfInfomsg(
if !c.writeIfInfomsg(typ, flags, msg) { if !c.writeIfInfomsg(typ, flags, msg) {
return syscall.ENOMEM return syscall.ENOMEM
} }
return c.Roundtrip(ctx, rtnlConsume) return c.Roundtrip(ctx, c.conn.rtnlConsume)
} }