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

Parse set element counters (#230)

This commit is contained in:
Ronak Jain 2023-05-20 21:53:52 +05:30 committed by GitHub
parent cf9b0d57e8
commit 45645ffbf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
set.go
View File

@ -22,6 +22,7 @@ import (
"time" "time"
"github.com/google/nftables/expr" "github.com/google/nftables/expr"
"github.com/google/nftables/internal/parseexprfunc"
"github.com/google/nftables/binaryutil" "github.com/google/nftables/binaryutil"
"github.com/mdlayher/netlink" "github.com/mdlayher/netlink"
@ -283,9 +284,11 @@ type SetElement struct {
// Life left of the "timeout" elements // Life left of the "timeout" elements
Expires time.Duration Expires time.Duration
Counter *expr.Counter
} }
func (s *SetElement) decode() func(b []byte) error { func (s *SetElement) decode(fam byte) func(b []byte) error {
return func(b []byte) error { return func(b []byte) error {
ad, err := netlink.NewAttributeDecoder(b) ad, err := netlink.NewAttributeDecoder(b)
if err != nil { if err != nil {
@ -317,6 +320,18 @@ func (s *SetElement) decode() func(b []byte) error {
s.Timeout = time.Millisecond * time.Duration(ad.Uint64()) s.Timeout = time.Millisecond * time.Duration(ad.Uint64())
case unix.NFTA_SET_ELEM_EXPIRATION: case unix.NFTA_SET_ELEM_EXPIRATION:
s.Expires = time.Millisecond * time.Duration(ad.Uint64()) s.Expires = time.Millisecond * time.Duration(ad.Uint64())
case unix.NFTA_SET_ELEM_EXPR:
elems, err := parseexprfunc.ParseExprBytesFunc(fam, ad, ad.Bytes())
if err != nil {
return err
}
for _, elem := range elems {
switch item := elem.(type) {
case *expr.Counter:
s.Counter = item
}
}
} }
} }
return ad.Err() return ad.Err()
@ -743,7 +758,7 @@ func parseSetDatatype(magic uint32) (SetDatatype, error) {
var elemHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWSETELEM) var elemHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWSETELEM)
func elementsFromMsg(msg netlink.Message) ([]SetElement, error) { func elementsFromMsg(fam byte, msg netlink.Message) ([]SetElement, error) {
if got, want := msg.Header.Type, elemHeaderType; got != want { if got, want := msg.Header.Type, elemHeaderType; got != want {
return nil, fmt.Errorf("unexpected header type: got %v, want %v", got, want) return nil, fmt.Errorf("unexpected header type: got %v, want %v", got, want)
} }
@ -767,7 +782,7 @@ func elementsFromMsg(msg netlink.Message) ([]SetElement, error) {
var elem SetElement var elem SetElement
switch ad.Type() { switch ad.Type() {
case unix.NFTA_LIST_ELEM: case unix.NFTA_LIST_ELEM:
ad.Do(elem.decode()) ad.Do(elem.decode(fam))
} }
elements = append(elements, elem) elements = append(elements, elem)
} }
@ -899,7 +914,7 @@ func (cc *Conn) GetSetElements(s *Set) ([]SetElement, error) {
} }
var elems []SetElement var elems []SetElement
for _, msg := range reply { for _, msg := range reply {
s, err := elementsFromMsg(msg) s, err := elementsFromMsg(uint8(s.Table.Family), msg)
if err != nil { if err != nil {
return nil, err return nil, err
} }