udata: add NFTNL_UDATA_SET_*TYPEOF* definitions
Pablo Neira Ayuso
maintainerPATCH 1/2 udata: add NFTNL_UDATA_SET_*TYPEOF* definitions
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/libnftnl/udata.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/libnftnl/udata.h +9 -0
@@ -22,10 +22,19 @@ enum nftnl_udata_set_types {NFTNL_UDATA_SET_KEYBYTEORDER ,NFTNL_UDATA_SET_DATABYTEORDER ,NFTNL_UDATA_SET_MERGE_ELEMENTS , +NFTNL_UDATA_SET_KEY_TYPEOF , +NFTNL_UDATA_SET_DATA_TYPEOF , __NFTNL_UDATA_SET_MAX };#define NFTNL_UDATA_SET_MAX (__NFTNL_UDATA_SET_MAX - 1) +enum { +NFTNL_UDATA_SET_TYPEOF_EXPR , +NFTNL_UDATA_SET_TYPEOF_DATA , + __NFTNL_UDATA_SET_TYPEOF_MAX, +}; +#define NFTNL_UDATA_SET_TYPEOF_MAX (__NFTNL_UDATA_SET_TYPEOF_MAX - 1) +enum nftnl_udata_set_elem_types {NFTNL_UDATA_SET_ELEM_COMMENT , NFTNL_UDATA_SET_ELEM_FLAGS,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/2 udata: support for TLV attribute nesting
This patch adds nftnl_udata_nest_start() and nftnl_udata_nest_end() to build attribute nests.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/libnftnl/udata.h | 5 +++++ src/libnftnl.map | 5 +++++ src/udata.c | 17 +++++++++++++++++ 3 files changed, 27 insertions(+)
include/libnftnl/udata.h +5 -0
@@ -75,6 +75,11 @@ bool nftnl_udata_put_u32(struct nftnl_udata_buf *buf, uint8_t type,bool nftnl_udata_put_strz (struct nftnl_udata_buf *buf,uint8_t type,const char *strz); +/* nest */ +struct nftnl_udata *nftnl_udata_nest_start (struct nftnl_udata_buf *buf, +uint8_t type); +void nftnl_udata_nest_end (struct nftnl_udata_buf *buf,struct nftnl_udata *ud); +/* nftnl_udata_attr */ uint8_t nftnl_udata_type (const struct nftnl_udata *attr);uint8_t nftnl_udata_len (const struct nftnl_udata *attr);
src/libnftnl.map +5 -0
@@ -359,3 +359,8 @@ LIBNFTNL_13 { nftnl_obj_set_data; nftnl_flowtable_set_data; } LIBNFTNL_12; + +LIBNFTNL_14 { + nftnl_udata_nest_start; + nftnl_udata_nest_end; +} LIBNFTNL_13;
src/udata.c +17 -0
@@ -150,3 +150,20 @@ int nftnl_udata_parse(const void *data, uint32_t data_len, nftnl_udata_cb_t cb,return ret; } + +EXPORT_SYMBOL (nftnl_udata_nest_start); +struct nftnl_udata *nftnl_udata_nest_start (struct nftnl_udata_buf *buf, +uint8_t type) +{ +struct nftnl_udata *ud =nftnl_udata_end (buf); + +nftnl_udata_put (buf, type,0 ,NULL ); + +return ud; +} + +EXPORT_SYMBOL (nftnl_udata_nest_end); +void nftnl_udata_nest_end (struct nftnl_udata_buf *buf,struct nftnl_udata *ud) +{ + ud->len = buf->end - (char *)ud; +}
Signature · 1 line
2.11.0