From 50403e9d60a69640107d20525379d4714da2f739 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 25 Mar 2026 15:34:20 +0900 Subject: internal/netlink: wrap netpoll via context This removes netpoll boilerplate for the most common use case. Signed-off-by: Ophestra --- container/dispatcher.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'container/dispatcher.go') diff --git a/container/dispatcher.go b/container/dispatcher.go index dce5f023..9f971fa5 100644 --- a/container/dispatcher.go +++ b/container/dispatcher.go @@ -1,6 +1,7 @@ package container import ( + "context" "io" "io/fs" "net" @@ -66,7 +67,7 @@ type syscallDispatcher interface { // ensureFile provides ensureFile. ensureFile(name string, perm, pperm os.FileMode) error // mustLoopback provides mustLoopback. - mustLoopback(msg message.Msg) + mustLoopback(ctx context.Context, msg message.Msg) // seccompLoad provides [seccomp.Load]. seccompLoad(rules []std.NativeRule, flags seccomp.ExportFlag) error @@ -170,7 +171,7 @@ func (k direct) mountTmpfs(fsname, target string, flags uintptr, size int, perm func (direct) ensureFile(name string, perm, pperm os.FileMode) error { return ensureFile(name, perm, pperm) } -func (direct) mustLoopback(msg message.Msg) { +func (direct) mustLoopback(ctx context.Context, msg message.Msg) { var lo int if ifi, err := net.InterfaceByName("lo"); err != nil { msg.GetLogger().Fatalln(err) @@ -199,11 +200,14 @@ func (direct) mustLoopback(msg message.Msg) { msg.GetLogger().Fatalf("RTNETLINK answers: %v", err) default: - msg.GetLogger().Fatalf("RTNETLINK answers with malformed message") + if err == context.DeadlineExceeded || err == context.Canceled { + msg.GetLogger().Fatalf("interrupted RTNETLINK operation") + } + msg.GetLogger().Fatal("RTNETLINK answers with malformed message") } } - must(c.SendNewaddrLo(uint32(lo))) - must(c.SendIfInfomsg(syscall.RTM_NEWLINK, 0, &syscall.IfInfomsg{ + must(c.SendNewaddrLo(ctx, uint32(lo))) + must(c.SendIfInfomsg(ctx, syscall.RTM_NEWLINK, 0, &syscall.IfInfomsg{ Family: syscall.AF_UNSPEC, Index: int32(lo), Flags: syscall.IFF_UP, -- cgit v1.3.1