Merge dae73eaa9c into 5494b7c55f

counter.go

@@ -57,10 +57,11 @@ func (c *CounterObj) marshal(data bool) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	const NFT_OBJECT_COUNTER = 1 // TODO: get into x/sys/unix
 	attrs := []netlink.Attribute{
 		{Type: unix.NFTA_OBJ_TABLE, Data: []byte(c.Table.Name + "\x00")},
 		{Type: unix.NFTA_OBJ_NAME, Data: []byte(c.Name + "\x00")},
-		{Type: unix.NFTA_OBJ_TYPE, Data: binaryutil.BigEndian.PutUint32(unix.NFT_OBJECT_COUNTER)},
+		{Type: unix.NFTA_OBJ_TYPE, Data: binaryutil.BigEndian.PutUint32(NFT_OBJECT_COUNTER)},
 	}
 	if data {
 		attrs = append(attrs, netlink.Attribute{Type: unix.NLA_F_NESTED | unix.NFTA_OBJ_DATA, Data: obj})

expr/expr.go

@@ -279,15 +279,16 @@ type Masq struct {
 	RegProtoMax uint32
 }
 
+// TODO, Once the constants below are available in golang.org/x/sys/unix, switch to use those.
 const (
 	// NF_NAT_RANGE_PROTO_RANDOM defines flag for a random masquerade
-	NF_NAT_RANGE_PROTO_RANDOM = unix.NF_NAT_RANGE_PROTO_RANDOM
+	NF_NAT_RANGE_PROTO_RANDOM = 0x4
 	// NF_NAT_RANGE_PROTO_RANDOM_FULLY defines flag for a fully random masquerade
-	NF_NAT_RANGE_PROTO_RANDOM_FULLY = unix.NF_NAT_RANGE_PROTO_RANDOM_FULLY
+	NF_NAT_RANGE_PROTO_RANDOM_FULLY = 0x10
 	// NF_NAT_RANGE_PERSISTENT defines flag for a persistent masquerade
-	NF_NAT_RANGE_PERSISTENT = unix.NF_NAT_RANGE_PERSISTENT
+	NF_NAT_RANGE_PERSISTENT = 0x8
 	// NF_NAT_RANGE_PREFIX defines flag for a prefix masquerade
-	NF_NAT_RANGE_PREFIX = unix.NF_NAT_RANGE_NETMAP
+	NF_NAT_RANGE_PREFIX = 0x40
 )
 
 func (e *Masq) marshal(fam byte) ([]byte, error) {

expr/queue.go

@@ -32,9 +32,10 @@ const (
 	QueueTotal QueueAttribute = unix.NFTA_QUEUE_TOTAL
 	QueueFlags QueueAttribute = unix.NFTA_QUEUE_FLAGS
 
-	QueueFlagBypass QueueFlag = unix.NFT_QUEUE_FLAG_BYPASS
+	// TODO: get into x/sys/unix
-	QueueFlagFanout QueueFlag = unix.NFT_QUEUE_FLAG_CPU_FANOUT
+	QueueFlagBypass QueueFlag = 0x01
-	QueueFlagMask   QueueFlag = unix.NFT_QUEUE_FLAG_MASK
+	QueueFlagFanout QueueFlag = 0x02
+	QueueFlagMask   QueueFlag = 0x03
 )
 
 type Queue struct {

obj.go

@@ -141,6 +141,7 @@ func objFromMsg(msg netlink.Message) (Obj, error) {
 		name       string
 		objectType uint32
 	)
+	const NFT_OBJECT_COUNTER = 1 // TODO: get into x/sys/unix
 	for ad.Next() {
 		switch ad.Type() {
 		case unix.NFTA_OBJ_TABLE:
@@ -151,7 +152,7 @@ func objFromMsg(msg netlink.Message) (Obj, error) {
 			objectType = ad.Uint32()
 		case unix.NFTA_OBJ_DATA:
 			switch objectType {
-			case unix.NFT_OBJECT_COUNTER:
+			case NFT_OBJECT_COUNTER:
 				o := CounterObj{
 					Table: table,
 					Name:  name,