src: add NFTNL_SET_ELEM_EXPRESSIONS
Pablo Neira Ayuso
maintainerPATCH 1/3 src: add NFTNL_SET_ELEM_EXPRESSIONS
NFTNL_SET_ELEM_EXPR defines the stateful expression type that this element stores. This is useful to restore runtime set element stateful expressions (when saving, then reboot and restore).
This patch adds support for the set element expression list, which generalizes NFTNL_SET_ELEM_EXPR.
This patch also adds nftnl_set_elem_add_expr() to add new expressions to set elements and nftnl_set_elem_expr_foreach() to iterate over the list of expressions.
--- include/libnftnl/set.h | 7 ++ include/linux/netfilter/nf_tables.h | 3 + include/set_elem.h | 2 +- src/libnftnl.map | 5 ++ src/set_elem.c | 111 +++++++++++++++++++++++----- 5 files changed, 110 insertions(+), 18 deletions(-)
include/libnftnl/set.h +7 -0
@@ -107,6 +107,7 @@ enum {NFTNL_SET_ELEM_EXPR ,NFTNL_SET_ELEM_OBJREF ,NFTNL_SET_ELEM_KEY_END , +NFTNL_SET_ELEM_EXPRESSIONS , __NFTNL_SET_ELEM_MAX };#define NFTNL_SET_ELEM_MAX (__NFTNL_SET_ELEM_MAX - 1)
@@ -144,6 +145,12 @@ int nftnl_set_elem_parse_file(struct nftnl_set_elem *e, enum nftnl_parse_type tyint nftnl_set_elem_snprintf (char *buf,size_t size,const struct nftnl_set_elem *s,uint32_t type,uint32_t flags);int nftnl_set_elem_fprintf (FILE *fp,const struct nftnl_set_elem *se,uint32_t type,uint32_t flags); +struct nftnl_expr ; +void nftnl_set_elem_add_expr (struct nftnl_set_elem *e,struct nftnl_expr *expr); +int nftnl_set_elem_expr_foreach (struct nftnl_set_elem *e, +int (*cb)(struct nftnl_expr *e,void *data), +void *data); +int nftnl_set_elem_foreach (struct nftnl_set *s,int (*cb)(struct nftnl_set_elem *e,void *data),void *data);struct nftnl_set_elems_iter ;
include/linux/netfilter/nf_tables.h +3 -0
@@ -367,6 +367,7 @@ enum nft_set_attributes {NFTA_SET_OBJ_TYPE ,NFTA_SET_HANDLE ,NFTA_SET_EXPR , +NFTA_SET_EXPRESSIONS , __NFTA_SET_MAX };#define NFTA_SET_MAX (__NFTA_SET_MAX - 1)
@@ -405,6 +406,7 @@ enum nft_set_elem_attributes {NFTA_SET_ELEM_PAD ,NFTA_SET_ELEM_OBJREF ,NFTA_SET_ELEM_KEY_END , +NFTA_SET_ELEM_EXPRESSIONS , __NFTA_SET_ELEM_MAX };#define NFTA_SET_ELEM_MAX (__NFTA_SET_ELEM_MAX - 1)
@@ -712,6 +714,7 @@ enum nft_dynset_attributes {NFTA_DYNSET_EXPR ,NFTA_DYNSET_PAD ,NFTA_DYNSET_FLAGS , +NFTA_DYNSET_EXPRESSIONS , __NFTA_DYNSET_MAX, };#define NFTA_DYNSET_MAX (__NFTA_DYNSET_MAX - 1)
include/set_elem.h +1 -1
@@ -10,7 +10,7 @@ struct nftnl_set_elem {union nftnl_data_reg key;union nftnl_data_reg key_end;union nftnl_data_reg data; -struct nftnl_expr *expr; +struct list_head expr_list;uint64_t timeout;uint64_t expiration;const char *objref;
src/libnftnl.map +5 -0
@@ -374,3 +374,8 @@ LIBNFTNL_15 { nftnl_expr_build_payload; nftnl_rule_del_expr; } LIBNFTNL_14; + +LIBNFTNL_16 { + nftnl_set_elem_add_expr; + nftnl_set_elem_expr_foreach; +} LIBNFTNL_15;
src/set_elem.c +94 -17
210 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/3 src: add NFTNL_SET_EXPRESSIONS
NFTNL_SET_EXPR defines the stateful expression type that this set stores in each element. This provides the set definition in terms of stateful expressions. The expression that is passed via NFNTL_SET_ELEM_EXPR must equal to this set stateful expression type, otherwise the kernel bails out.
This patch adds support for the set expression list, which generalizes NFTNL_SET_EXPR.
This patch also adds nftnl_set_add_expr() to add new expressions to a set and nftnl_set_elem_expr_foreach() to iterate over the list of expressions.
--- include/libnftnl/set.h | 7 +++ include/set.h | 2 +- src/libnftnl.map | 2 + src/set.c | 111 +++++++++++++++++++++++++++++++++++------ 4 files changed, 105 insertions(+), 17 deletions(-)
include/libnftnl/set.h +7 -0
@@ -31,6 +31,7 @@ enum nftnl_set_attr {NFTNL_SET_HANDLE ,NFTNL_SET_DESC_CONCAT ,NFTNL_SET_EXPR , +NFTNL_SET_EXPRESSIONS , __NFTNL_SET_MAX };#define NFTNL_SET_MAX (__NFTNL_SET_MAX - 1)
@@ -80,6 +81,12 @@ int nftnl_set_list_foreach(struct nftnl_set_list *set_list, int (*cb)(struct nftstruct nftnl_set *nftnl_set_list_lookup_byname (struct nftnl_set_list *set_list,const char *set); +struct nftnl_expr ; +void nftnl_set_add_expr (struct nftnl_set *s,struct nftnl_expr *expr); +int nftnl_set_expr_foreach (struct nftnl_set *s, +int (*cb)(struct nftnl_expr *e,void *data), +void *data); +struct nftnl_set_list_iter ;struct nftnl_set_list_iter *nftnl_set_list_iter_create (const struct nftnl_set_list *l);struct nftnl_set *nftnl_set_list_iter_cur (const struct nftnl_set_list_iter *iter);
include/set.h +1 -1
@@ -33,7 +33,7 @@ struct nftnl_set {uint32_t flags;uint32_t gc_interval;uint64_t timeout; -struct nftnl_expr *expr; +struct list_head expr_list; };struct nftnl_set_list ;
src/libnftnl.map +2 -0
@@ -376,6 +376,8 @@ LIBNFTNL_15 { } LIBNFTNL_14; LIBNFTNL_16 { + nftnl_set_add_expr; + nftnl_set_expr_foreach; nftnl_set_elem_add_expr; nftnl_set_elem_expr_foreach; } LIBNFTNL_15;
src/set.c +95 -16
207 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/3 src: add NFTNL_EXPR_DYNSET_EXPRESSIONS
In reply to Pablo Neira AyusoNFTNL_EXPR_DYNSET_EXPR defines the stateful expression type that an element stores when added from the packet path.
This patch adds support for the set expression list, which generalizes NFTNL_EXPR_DYNSET_EXPR.
This patch also adds nftnl_expr_add_expr() to add new expressions to elements and nftnl_set_expr_expr_foreach() to iterate over the list of expressions.
--- include/expr_ops.h | 1 + include/libnftnl/expr.h | 7 +++ src/expr.c | 3 ++ src/expr/dynset.c | 111 +++++++++++++++++++++++++++++++++++----- src/libnftnl.map | 2 + 5 files changed, 110 insertions(+), 14 deletions(-)
include/expr_ops.h +1 -0
@@ -12,6 +12,7 @@ struct expr_ops {const char *name;uint32_t alloc_len;int max_attr; +void (*init)(const struct nftnl_expr *e);void (*free)(const struct nftnl_expr *e);int (*set)(struct nftnl_expr *e,uint16_t type,const void *data,uint32_t data_len);const void *(*get)(const struct nftnl_expr *e,uint16_t type,uint32_t *data_len);
include/libnftnl/expr.h +7 -0
@@ -38,6 +38,12 @@ const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type);void nftnl_expr_build_payload (struct nlmsghdr *nlh,struct nftnl_expr *expr); +/* For dynset expressions. */ +void nftnl_expr_add_expr (struct nftnl_expr *expr,uint32_t type,struct nftnl_expr *e); +int nftnl_expr_expr_foreach (struct nftnl_expr *e, +int (*cb)(struct nftnl_expr *e,void *data), +void *data); +int nftnl_expr_snprintf (char *buf,size_t buflen,const struct nftnl_expr *expr,uint32_t type,uint32_t flags);int nftnl_expr_fprintf (FILE *fp,const struct nftnl_expr *expr,uint32_t type,uint32_t flags);
@@ -167,6 +173,7 @@ enum {NFTNL_EXPR_DYNSET_SET_NAME ,NFTNL_EXPR_DYNSET_SET_ID ,NFTNL_EXPR_DYNSET_EXPR , + NFTNL_EXPR_DYNSET_EXPRESSIONS, }; enum {
src/expr.c +3 -0
@@ -42,6 +42,9 @@ struct nftnl_expr *nftnl_expr_alloc(const char *name) expr->flags |= (1 <<NFTNL_EXPR_NAME ); expr->ops = ops; +if (ops->init) + ops->init (expr); +return expr; }
src/expr/dynset.c +97 -14
193 lines not on this page · raw message
src/libnftnl.map +2 -0
@@ -380,4 +380,6 @@ LIBNFTNL_16 { nftnl_set_expr_foreach; nftnl_set_elem_add_expr; nftnl_set_elem_expr_foreach; + nftnl_expr_add_expr; + nftnl_expr_expr_foreach; } LIBNFTNL_15;
Signature · 1 line
2.20.1