Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,37 +185,34 @@ func (cc *Conn) receiveSeq(conn *netlink.Conn) iter.Seq2[netlink.Message, error]
break
}

replies, err := conn.Receive()
if err != nil {
// Yield the error but continue iterating
if !yield(netlink.Message{}, err) {
return
for res, err := range conn.ReceiveIter() {
if err != nil {
// Yield the error but continue iterating
if !yield(netlink.Message{}, err) {
return
}
}
continue
}

if len(replies) == 0 && cc.TestDial != nil {
// When using a test dial function, we don't always get a reply for each
// sent message. Additionally, there is no buffer to poll for more data,
// so we stop here.
return
}

for _, msg := range replies {
// Filter out non-nftables messages.
// In practice, this would only be netlink.Error messages.
// Those are handled by the netlink library itself and should be
// reported as errors by conn.Receive().
subsystem := msg.Header.Type >> 8
// reported as errors by conn.ReceiveIter().
subsystem := res.Header.Type >> 8
if subsystem != unix.NFNL_SUBSYS_NFTABLES {
continue
}

// Stop iteration if yield returns false
if !yield(msg, nil) {
if !yield(res, nil) {
return
}
}

if cc.TestDial != nil {
// When using a test dial function, we don't always get a reply for each
// sent message. Additionally, there is no buffer to poll for more data,
// so we stop here.
return
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ require (
golang.org/x/net v0.43.0 // indirect
golang.org/x/sync v0.6.0 // indirect
)

replace github.com/mdlayher/netlink => ../netlink
25 changes: 15 additions & 10 deletions rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,25 @@ func (cc *Conn) getRules(t *Table, c *Chain, msgType nftMsgType, handle uint64)
return nil, fmt.Errorf("SendMessages: %v", err)
}

reply, err := cc.receive(conn)
if err != nil {
return nil, fmt.Errorf("receive: %w", err)
}
var rules []*Rule
for _, msg := range reply {
r, err := ruleFromMsg(t.Family, msg)
if err != nil {
return nil, err
var firstErr error

for msg, err := range cc.receiveSeq(conn) {
if err != nil && firstErr == nil {
firstErr = err
continue
}
rules = append(rules, r)

rule, err := ruleFromMsg(t.Family, msg)
if err != nil && firstErr == nil {
firstErr = err
continue
}

rules = append(rules, rule)
}

return rules, nil
return rules, firstErr
}

func (cc *Conn) newRule(r *Rule, op ruleOperation) *Rule {
Expand Down
24 changes: 14 additions & 10 deletions set.go
Original file line number Diff line number Diff line change
Expand Up @@ -1106,20 +1106,24 @@ func (cc *Conn) getSetElements(s *Set, e []SetElement, reset bool) ([]SetElement
return nil, fmt.Errorf("SendMessages: %v", err)
}

reply, err := cc.receive(conn)
if err != nil {
return nil, fmt.Errorf("receive: %w", err)
}
var elems []SetElement
for _, msg := range reply {
s, err := elementsFromMsg(uint8(s.Table.Family), msg)
if err != nil {
return nil, err
var firstErr error
for msg, err := range cc.receiveSeq(conn) {
if err != nil && firstErr == nil {
firstErr = err
continue
}
elems = append(elems, s...)

e, err := elementsFromMsg(uint8(s.Table.Family), msg)
if err != nil && firstErr == nil {
firstErr = err
continue
}

elems = append(elems, e...)
}

return elems, nil
return elems, firstErr
}

// GetSetElements returns the elements in the specified set.
Expand Down