zishuo/netlink
1
0
Fork 0
mirror of https://github.com/vishvananda/netlink.git synced 2025-09-26 20:01:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't log on unknown fou or ipset attributes

Browse Source 
The library doesn't log anywhere else for (yet) unknown attributes.
These may appear any time a new kernel is used which adds new attributes.
This commit is contained in:
Tobias Klauser
2025-07-22 15:57:14 +02:00
committed by Alessandro Boch
parent 9f36d6654a
commit 7a3403a870
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fou_linux.go
View File

@@ -6,7 +6,6 @@ package netlink
import ( import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"log"
"net" "net"
"github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
@@ -202,8 +201,6 @@ func deserializeFouMsg(msg []byte) (Fou, error) {
fou.PeerPort = int(networkOrder.Uint16(attr.Value)) fou.PeerPort = int(networkOrder.Uint16(attr.Value))
case FOU_ATTR_IFINDEX: case FOU_ATTR_IFINDEX:
fou.IfIndex = int(native.Uint16(attr.Value)) fou.IfIndex = int(native.Uint16(attr.Value))
default:
log.Printf("unknown fou attribute from kernel: %+v %v", attr, attr.Type&nl.NLA_TYPE_MASK)
} }
} }

17
ipset_linux.go
View File

@@ -2,7 +2,6 @@ package netlink
import ( import (
"encoding/binary" "encoding/binary"
"log"
"net" "net"
"syscall" "syscall"
@@ -516,8 +515,6 @@ func (result *IPSetResult) unserialize(msg []byte) {
result.ProtocolMinVersion = attr.Value[0] result.ProtocolMinVersion = attr.Value[0]
case nl.IPSET_ATTR_MARKMASK: case nl.IPSET_ATTR_MARKMASK:
result.MarkMask = attr.Uint32() result.MarkMask = attr.Uint32()
default:
log.Printf("unknown ipset attribute from kernel: %+v %v", attr, attr.Type&nl.NLA_TYPE_MASK)
} }
} }
} }
@@ -547,8 +544,6 @@ func (result *IPSetResult) parseAttrData(data []byte) {
result.Entries = append(result.Entries, IPSetEntry{IP: nested.Value}) result.Entries = append(result.Entries, IPSetEntry{IP: nested.Value})
case nl.IPSET_ATTR_IP: case nl.IPSET_ATTR_IP:
result.IPFrom = nested.Value result.IPFrom = nested.Value
default:
log.Printf("unknown nested ipset data attribute from kernel: %+v %v", nested, nested.Type&nl.NLA_TYPE_MASK)
} }
} }
case nl.IPSET_ATTR_IP_TO | nl.NLA_F_NESTED: case nl.IPSET_ATTR_IP_TO | nl.NLA_F_NESTED:
@@ -556,8 +551,6 @@ func (result *IPSetResult) parseAttrData(data []byte) {
switch nested.Type { switch nested.Type {
case nl.IPSET_ATTR_IP: case nl.IPSET_ATTR_IP:
result.IPTo = nested.Value result.IPTo = nested.Value
default:
log.Printf("unknown nested ipset data attribute from kernel: %+v %v", nested, nested.Type&nl.NLA_TYPE_MASK)
} }
} }
case nl.IPSET_ATTR_PORT_FROM | nl.NLA_F_NET_BYTEORDER: case nl.IPSET_ATTR_PORT_FROM | nl.NLA_F_NET_BYTEORDER:
@@ -570,8 +563,6 @@ func (result *IPSetResult) parseAttrData(data []byte) {
result.Comment = nl.BytesToString(attr.Value) result.Comment = nl.BytesToString(attr.Value)
case nl.IPSET_ATTR_MARKMASK: case nl.IPSET_ATTR_MARKMASK:
result.MarkMask = attr.Uint32() result.MarkMask = attr.Uint32()
default:
log.Printf("unknown ipset data attribute from kernel: %+v %v", attr, attr.Type&nl.NLA_TYPE_MASK)
} }
} }
} }
@@ -581,8 +572,6 @@ func (result *IPSetResult) parseAttrADT(data []byte) {
switch attr.Type { switch attr.Type {
case nl.IPSET_ATTR_DATA | nl.NLA_F_NESTED: case nl.IPSET_ATTR_DATA | nl.NLA_F_NESTED:
result.Entries = append(result.Entries, parseIPSetEntry(attr.Value)) result.Entries = append(result.Entries, parseIPSetEntry(attr.Value))
default:
log.Printf("unknown ADT attribute from kernel: %+v %v", attr, attr.Type&nl.NLA_TYPE_MASK)
} }
} }
} }
@@ -610,8 +599,6 @@ func parseIPSetEntry(data []byte) (entry IPSetEntry) {
switch attr.Type { switch attr.Type {
case nl.IPSET_ATTR_IPADDR_IPV4, nl.IPSET_ATTR_IPADDR_IPV6: case nl.IPSET_ATTR_IPADDR_IPV4, nl.IPSET_ATTR_IPADDR_IPV6:
entry.IP = net.IP(attr.Value) entry.IP = net.IP(attr.Value)
default:
log.Printf("unknown nested ADT attribute from kernel: %+v", attr)
} }
} }
case nl.IPSET_ATTR_IP2 | nl.NLA_F_NESTED: case nl.IPSET_ATTR_IP2 | nl.NLA_F_NESTED:
@@ -619,8 +606,6 @@ func parseIPSetEntry(data []byte) (entry IPSetEntry) {
switch attr.Type { switch attr.Type {
case nl.IPSET_ATTR_IPADDR_IPV4, nl.IPSET_ATTR_IPADDR_IPV6: case nl.IPSET_ATTR_IPADDR_IPV4, nl.IPSET_ATTR_IPADDR_IPV6:
entry.IP2 = net.IP(attr.Value) entry.IP2 = net.IP(attr.Value)
default:
log.Printf("unknown nested ADT attribute from kernel: %+v", attr)
} }
} }
case nl.IPSET_ATTR_CIDR: case nl.IPSET_ATTR_CIDR:
@@ -638,8 +623,6 @@ func parseIPSetEntry(data []byte) (entry IPSetEntry) {
case nl.IPSET_ATTR_MARK | nl.NLA_F_NET_BYTEORDER: case nl.IPSET_ATTR_MARK | nl.NLA_F_NET_BYTEORDER:
val := attr.Uint32() val := attr.Uint32()
entry.Mark = &val entry.Mark = &val
default:
log.Printf("unknown ADT attribute from kernel: %+v", attr)
} }
} }
return return