Merge dd13cb1d03 into 63dd116924

set.go

@@ -572,7 +572,7 @@ func (cc *Conn) AddSet(s *Set, vals []SetElement) error {
 	if s.IsMap {
 		// Check if it is vmap case
 		if s.DataType.nftMagic == 1 {
-			// For Verdict data type, the expected magic is 0xffffff00
+			// For Verdict data type, the expected magic is 0xfffff0
 			tableInfo = append(tableInfo, netlink.Attribute{Type: unix.NFTA_SET_DATA_TYPE, Data: binaryutil.BigEndian.PutUint32(uint32(unix.NFT_DATA_VERDICT))},
 				netlink.Attribute{Type: unix.NFTA_SET_DATA_LEN, Data: binaryutil.BigEndian.PutUint32(s.DataType.Bytes)})
 		} else {
@@ -772,8 +772,9 @@ func setsFromMsg(msg netlink.Message) (*Set, error) {
 		case unix.NFTA_SET_DATA_TYPE:
 			nftMagic := ad.Uint32()
 			// Special case for the data type verdict, in the message it is stored as 0xffffff00 but it is defined as 1
-			if nftMagic == unix.NFT_DATA_VERDICT {
-				nftMagic = 1
+			if nftMagic == 0xffffff00 {
+				set.KeyType = TypeVerdict
+				break
 			}
 			dt, err := parseSetDatatype(nftMagic)
 			if err != nil {

set_test.go

@@ -240,30 +240,6 @@ func TestMarshalSet(t *testing.T) {
 				Timeout:    30 * time.Second,
 			},
 		},
-		{
-			name: "Map ip-ip", // generic case
-			set: Set{
-				Name:     "test-map",
-				ID:       uint32(3),
-				Table:    tbl,
-				KeyType:  TypeIPAddr,
-				DataType: TypeIPAddr,
-				IsMap:    true,
-			},
-		},
-		{
-			// special case, see
-			// sets.go:setsFromMsg:(case unix.NFTA_SET_DATA_TYPE) and sets.go:AddSet:(if s.DataType.nftMagic == 1)
-			name: "Vedict map",
-			set: Set{
-				Name:     "test-map",
-				ID:       uint32(3),
-				Table:    tbl,
-				KeyType:  TypeIPAddr,
-				DataType: TypeVerdict,
-				IsMap:    true,
-			},
-		},
 	}
 
 	for i, tt := range tests {