interesting
/
nftables
mirror of https://github.com/google/nftables.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix set.KeyType ovewrite for vmap

This commit is contained in:
Nikita Vorontsov 2025-07-09 15:24:13 +03:00
parent 63dd116924
commit 879036fb19
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
set.go
View File

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