Fix parsing of packets and bytes

vishvananda · Oct 31, 2018 · 5e41be0 · 5e41be0
1 parent be087d3
commit 5e41be0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/ipset_linux.go b/ipset_linux.go
@@ -15,8 +15,8 @@ type IPSetEntry struct {
 	MAC     net.HardwareAddr
 	IP      net.IP
 	Timeout *uint32
-	Packets *uint32
-	Bytes   *uint32
+	Packets *uint64
+	Bytes   *uint64
 
 	Replace bool // replace existing entry
 }
@@ -303,6 +303,12 @@ func parseIPSetEntry(data []byte) (entry IPSetEntry) {
 		case nl.IPSET_ATTR_TIMEOUT | nl.NLA_F_NET_BYTEORDER:
 			val := attr.Uint32()
 			entry.Timeout = &val
+		case nl.IPSET_ATTR_BYTES | nl.NLA_F_NET_BYTEORDER:
+			val := attr.Uint64()
+			entry.Bytes = &val
+		case nl.IPSET_ATTR_PACKETS | nl.NLA_F_NET_BYTEORDER:
+			val := attr.Uint64()
+			entry.Packets = &val
 		case nl.IPSET_ATTR_ETHER:
 			entry.MAC = net.HardwareAddr(attr.Value)
 		case nl.IPSET_ATTR_COMMENT:

diff --git a/nl/parse_attr.go b/nl/parse_attr.go
@@ -56,3 +56,12 @@ func (attr *Attribute) Uint32() uint32 {
 		return NativeEndian().Uint32(attr.Value)
 	}
 }
+
+// Uint64 returns the uint64 value respecting the NET_BYTEORDER flag
+func (attr *Attribute) Uint64() uint64 {
+	if attr.Type&NLA_F_NET_BYTEORDER != 0 {
+		return binary.BigEndian.Uint64(attr.Value)
+	} else {
+		return NativeEndian().Uint64(attr.Value)
+	}
+}