diff --git a/chain.go b/chain.go index f1853cf..e917e39 100644 --- a/chain.go +++ b/chain.go @@ -215,7 +215,7 @@ func (cc *Conn) ListChain(table *Table, chain string) (*Chain, error) { response, err := conn.Execute(msg) if err != nil { - return nil, fmt.Errorf("conn.Execute failed: %v", err) + return nil, fmt.Errorf("conn.Execute failed: %w", err) } if got, want := len(response), 1; got != want { diff --git a/expr/immediate.go b/expr/immediate.go index 19eea44..52c16aa 100644 --- a/expr/immediate.go +++ b/expr/immediate.go @@ -66,7 +66,7 @@ func (e *Immediate) unmarshal(fam byte, data []byte) error { case unix.NFTA_IMMEDIATE_DATA: nestedAD, err := netlink.NewAttributeDecoder(ad.Bytes()) if err != nil { - return fmt.Errorf("nested NewAttributeDecoder() failed: %v", err) + return fmt.Errorf("nested NewAttributeDecoder() failed: %w", err) } for nestedAD.Next() { switch nestedAD.Type() { @@ -75,7 +75,7 @@ func (e *Immediate) unmarshal(fam byte, data []byte) error { } } if nestedAD.Err() != nil { - return fmt.Errorf("decoding immediate: %v", nestedAD.Err()) + return fmt.Errorf("decoding immediate: %w", nestedAD.Err()) } } } diff --git a/expr/verdict.go b/expr/verdict.go index 239b408..e0d53f8 100644 --- a/expr/verdict.go +++ b/expr/verdict.go @@ -111,7 +111,7 @@ func (e *Verdict) unmarshal(fam byte, data []byte) error { case unix.NFTA_IMMEDIATE_DATA: nestedAD, err := netlink.NewAttributeDecoder(ad.Bytes()) if err != nil { - return fmt.Errorf("nested NewAttributeDecoder() failed: %v", err) + return fmt.Errorf("nested NewAttributeDecoder() failed: %w", err) } for nestedAD.Next() { switch nestedAD.Type() { @@ -123,7 +123,7 @@ func (e *Verdict) unmarshal(fam byte, data []byte) error { } } if nestedAD.Err() != nil { - return fmt.Errorf("decoding immediate: %v", nestedAD.Err()) + return fmt.Errorf("decoding immediate: %w", nestedAD.Err()) } } } diff --git a/flowtable.go b/flowtable.go index a35712f..1da1640 100644 --- a/flowtable.go +++ b/flowtable.go @@ -214,12 +214,12 @@ func (cc *Conn) getFlowtables(t *Table) ([]netlink.Message, error) { } if _, err := conn.SendMessages([]netlink.Message{message}); err != nil { - return nil, fmt.Errorf("SendMessages: %v", err) + return nil, fmt.Errorf("SendMessages: %w", err) } reply, err := receiveAckAware(conn, message.Header.Flags) if err != nil { - return nil, fmt.Errorf("receiveAckAware: %v", err) + return nil, fmt.Errorf("receiveAckAware: %w", err) } return reply, nil diff --git a/obj.go b/obj.go index 65c4402..8331b18 100644 --- a/obj.go +++ b/obj.go @@ -361,12 +361,12 @@ func (cc *Conn) getObjWithLegacyType(o Obj, t *Table, msgType uint16, returnLega } if _, err := conn.SendMessages([]netlink.Message{message}); err != nil { - return nil, fmt.Errorf("SendMessages: %v", err) + return nil, fmt.Errorf("SendMessages: %w", err) } reply, err := receiveAckAware(conn, message.Header.Flags) if err != nil { - return nil, fmt.Errorf("receiveAckAware: %v", err) + return nil, fmt.Errorf("receiveAckAware: %w", err) } var objs []Obj for _, msg := range reply { diff --git a/rule.go b/rule.go index 10958c6..d90a62e 100644 --- a/rule.go +++ b/rule.go @@ -101,12 +101,12 @@ func (cc *Conn) GetRules(t *Table, c *Chain) ([]*Rule, error) { } if _, err := conn.SendMessages([]netlink.Message{message}); err != nil { - return nil, fmt.Errorf("SendMessages: %v", err) + return nil, fmt.Errorf("SendMessages: %w", err) } reply, err := receiveAckAware(conn, message.Header.Flags) if err != nil { - return nil, fmt.Errorf("receiveAckAware: %v", err) + return nil, fmt.Errorf("receiveAckAware: %w", err) } var rules []*Rule for _, msg := range reply { diff --git a/set.go b/set.go index 5818ca7..b31d145 100644 --- a/set.go +++ b/set.go @@ -298,7 +298,7 @@ func (s *SetElement) decode(fam byte) func(b []byte) error { return func(b []byte) error { ad, err := netlink.NewAttributeDecoder(b) if err != nil { - return fmt.Errorf("failed to create nested attribute decoder: %v", err) + return fmt.Errorf("failed to create nested attribute decoder: %w", err) } ad.ByteOrder = binary.BigEndian @@ -353,7 +353,7 @@ func (s *SetElement) decode(fam byte) func(b []byte) error { func decodeElement(d []byte) ([]byte, error) { ad, err := netlink.NewAttributeDecoder(d) if err != nil { - return nil, fmt.Errorf("failed to create nested attribute decoder: %v", err) + return nil, fmt.Errorf("failed to create nested attribute decoder: %w", err) } ad.ByteOrder = binary.BigEndian var b []byte @@ -414,14 +414,14 @@ func (cc *Conn) appendElemList(s *Set, vals []SetElement, hdrType uint16) error encodedKey, err := netlink.MarshalAttributes([]netlink.Attribute{{Type: unix.NFTA_DATA_VALUE, Data: v.Key}}) if err != nil { - return fmt.Errorf("marshal key %d: %v", i, err) + return fmt.Errorf("marshal key %d: %w", i, err) } item = append(item, netlink.Attribute{Type: unix.NFTA_SET_ELEM_KEY | unix.NLA_F_NESTED, Data: encodedKey}) if len(v.KeyEnd) > 0 { encodedKeyEnd, err := netlink.MarshalAttributes([]netlink.Attribute{{Type: unix.NFTA_DATA_VALUE, Data: v.KeyEnd}}) if err != nil { - return fmt.Errorf("marshal key end %d: %v", i, err) + return fmt.Errorf("marshal key end %d: %w", i, err) } item = append(item, netlink.Attribute{Type: NFTA_SET_ELEM_KEY_END | unix.NLA_F_NESTED, Data: encodedKeyEnd}) } @@ -441,7 +441,7 @@ func (cc *Conn) appendElemList(s *Set, vals []SetElement, hdrType uint16) error {Type: unix.NFTA_DATA_VALUE, Data: binaryutil.BigEndian.PutUint32(uint32(v.VerdictData.Kind))}, }) if err != nil { - return fmt.Errorf("marshal item %d: %v", i, err) + return fmt.Errorf("marshal item %d: %w", i, err) } encodedVal = append(encodedVal, encodedKind...) if len(v.VerdictData.Chain) != 0 { @@ -449,21 +449,21 @@ func (cc *Conn) appendElemList(s *Set, vals []SetElement, hdrType uint16) error {Type: unix.NFTA_SET_ELEM_DATA, Data: []byte(v.VerdictData.Chain + "\x00")}, }) if err != nil { - return fmt.Errorf("marshal item %d: %v", i, err) + return fmt.Errorf("marshal item %d: %w", i, err) } encodedVal = append(encodedVal, encodedChain...) } encodedVerdict, err := netlink.MarshalAttributes([]netlink.Attribute{ {Type: unix.NFTA_SET_ELEM_DATA | unix.NLA_F_NESTED, Data: encodedVal}}) if err != nil { - return fmt.Errorf("marshal item %d: %v", i, err) + return fmt.Errorf("marshal item %d: %w", i, err) } item = append(item, netlink.Attribute{Type: unix.NFTA_SET_ELEM_DATA | unix.NLA_F_NESTED, Data: encodedVerdict}) case len(v.Val) > 0: // Since v.Val's length is not 0 then, v is a regular map element, need to add to the attributes encodedVal, err := netlink.MarshalAttributes([]netlink.Attribute{{Type: unix.NFTA_DATA_VALUE, Data: v.Val}}) if err != nil { - return fmt.Errorf("marshal item %d: %v", i, err) + return fmt.Errorf("marshal item %d: %w", i, err) } item = append(item, netlink.Attribute{Type: unix.NFTA_SET_ELEM_DATA | unix.NLA_F_NESTED, Data: encodedVal}) @@ -479,7 +479,7 @@ func (cc *Conn) appendElemList(s *Set, vals []SetElement, hdrType uint16) error encodedItem, err := netlink.MarshalAttributes(item) if err != nil { - return fmt.Errorf("marshal item %d: %v", i, err) + return fmt.Errorf("marshal item %d: %w", i, err) } itemSize := unix.NLA_HDRLEN + len(encodedItem) @@ -496,7 +496,7 @@ func (cc *Conn) appendElemList(s *Set, vals []SetElement, hdrType uint16) error for _, batch := range batches { encodedElem, err := netlink.MarshalAttributes(batch) if err != nil { - return fmt.Errorf("marshal elements: %v", err) + return fmt.Errorf("marshal elements: %w", err) } message := []netlink.Attribute{ @@ -591,7 +591,7 @@ func (cc *Conn) AddSet(s *Set, vals []SetElement) error { {Type: unix.NFTA_DATA_VALUE, Data: binaryutil.BigEndian.PutUint32(uint32(len(vals)))}, }) if err != nil { - return fmt.Errorf("fail to marshal number of elements %d: %v", len(vals), err) + return fmt.Errorf("fail to marshal number of elements %d: %w", len(vals), err) } tableInfo = append(tableInfo, netlink.Attribute{Type: unix.NLA_F_NESTED | unix.NFTA_SET_DESC, Data: numberOfElements}) } @@ -620,7 +620,7 @@ func (cc *Conn) AddSet(s *Set, vals []SetElement) error { {Type: unix.NFTA_DATA_VALUE, Data: binaryutil.BigEndian.PutUint32(v.Bytes)}, }) if err != nil { - return fmt.Errorf("fail to marshal element key size %d: %v", i, err) + return fmt.Errorf("fail to marshal element key size %d: %w", i, err) } // Marshal base type size description descSize, err := netlink.MarshalAttributes([]netlink.Attribute{ @@ -634,7 +634,7 @@ func (cc *Conn) AddSet(s *Set, vals []SetElement) error { // Marshal all base type descriptions into concatenation size description concatBytes, err := netlink.MarshalAttributes([]netlink.Attribute{{Type: unix.NLA_F_NESTED | NFTA_SET_DESC_CONCAT, Data: concatDefinition}}) if err != nil { - return fmt.Errorf("fail to marshal concat definition %v", err) + return fmt.Errorf("fail to marshal concat definition %w", err) } descBytes = append(descBytes, concatBytes...) @@ -890,12 +890,12 @@ func (cc *Conn) GetSets(t *Table) ([]*Set, error) { } if _, err := conn.SendMessages([]netlink.Message{message}); err != nil { - return nil, fmt.Errorf("SendMessages: %v", err) + return nil, fmt.Errorf("SendMessages: %w", err) } reply, err := receiveAckAware(conn, message.Header.Flags) if err != nil { - return nil, fmt.Errorf("receiveAckAware: %v", err) + return nil, fmt.Errorf("receiveAckAware: %w", err) } var sets []*Set for _, msg := range reply { @@ -980,12 +980,12 @@ func (cc *Conn) GetSetElements(s *Set) ([]SetElement, error) { } if _, err := conn.SendMessages([]netlink.Message{message}); err != nil { - return nil, fmt.Errorf("SendMessages: %v", err) + return nil, fmt.Errorf("SendMessages: %w", err) } reply, err := receiveAckAware(conn, message.Header.Flags) if err != nil { - return nil, fmt.Errorf("receiveAckAware: %v", err) + return nil, fmt.Errorf("receiveAckAware: %w", err) } var elems []SetElement for _, msg := range reply {