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

Add set's id to newsetelem message (#89)

This commit is contained in:
Serguei Bezverkhi 2020-01-01 11:05:55 -05:00 committed by Michael Stapelberg
parent c4896ab7c6
commit 80a905063c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
set.go
View File

@ -161,7 +161,7 @@ func (cc *Conn) SetAddElements(s *Set, vals []SetElement) error {
return errors.New("anonymous sets cannot be updated") return errors.New("anonymous sets cannot be updated")
} }
elements, err := s.makeElemList(vals) elements, err := s.makeElemList(vals, s.ID)
if err != nil { if err != nil {
return err return err
} }
@ -176,7 +176,7 @@ func (cc *Conn) SetAddElements(s *Set, vals []SetElement) error {
return nil return nil
} }
func (s *Set) makeElemList(vals []SetElement) ([]netlink.Attribute, error) { func (s *Set) makeElemList(vals []SetElement, id uint32) ([]netlink.Attribute, error) {
var elements []netlink.Attribute var elements []netlink.Attribute
for i, v := range vals { for i, v := range vals {
@ -248,7 +248,7 @@ func (s *Set) makeElemList(vals []SetElement) ([]netlink.Attribute, error) {
return []netlink.Attribute{ return []netlink.Attribute{
{Type: unix.NFTA_SET_NAME, Data: []byte(s.Name + "\x00")}, {Type: unix.NFTA_SET_NAME, Data: []byte(s.Name + "\x00")},
{Type: unix.NFTA_SET_KEY_TYPE, Data: binaryutil.BigEndian.PutUint32(unix.NFTA_DATA_VALUE)}, {Type: unix.NFTA_LOOKUP_SET_ID, Data: binaryutil.BigEndian.PutUint32(id)},
{Type: unix.NFTA_SET_TABLE, Data: []byte(s.Table.Name + "\x00")}, {Type: unix.NFTA_SET_TABLE, Data: []byte(s.Table.Name + "\x00")},
{Type: unix.NFTA_SET_ELEM_LIST_ELEMENTS | unix.NLA_F_NESTED, Data: encodedElem}, {Type: unix.NFTA_SET_ELEM_LIST_ELEMENTS | unix.NLA_F_NESTED, Data: encodedElem},
}, nil }, nil
@ -338,7 +338,7 @@ func (cc *Conn) AddSet(s *Set, vals []SetElement) error {
// Set the values of the set if initial values were provided. // Set the values of the set if initial values were provided.
if len(vals) > 0 { if len(vals) > 0 {
hdrType := unix.NFT_MSG_NEWSETELEM hdrType := unix.NFT_MSG_NEWSETELEM
elements, err := s.makeElemList(vals) elements, err := s.makeElemList(vals, s.ID)
if err != nil { if err != nil {
return err return err
} }
@ -379,7 +379,7 @@ func (cc *Conn) SetDeleteElements(s *Set, vals []SetElement) error {
return errors.New("anonymous sets cannot be updated") return errors.New("anonymous sets cannot be updated")
} }
elements, err := s.makeElemList(vals) elements, err := s.makeElemList(vals, s.ID)
if err != nil { if err != nil {
return err return err
} }