object: define nftnl_obj_unset()
Pablo Neira Ayuso
maintainerPATCH 1/1 object: define nftnl_obj_unset()
For consistency with existing objects, implement this interface. This is already defined in libnftnl.map so the intention was to provide it.
--- src/object.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
src/object.c +28 -0
@@ -69,6 +69,34 @@ bool nftnl_obj_is_set(const struct nftnl_obj *obj, uint16_t attr)return obj->flags & (1 << attr); } +EXPORT_SYMBOL (nftnl_obj_unset); +void nftnl_obj_unset (struct nftnl_obj *obj,uint16_t attr) +{ +if (!(obj->flags & (1 << attr))) +return ; + +switch (attr) { +case NFTNL_OBJ_TABLE : +xfree (obj->table); +break ; +case NFTNL_OBJ_NAME : +xfree (obj->name); +break ; +case NFTNL_OBJ_USERDATA : +xfree (obj->user.data); +break ; +case NFTNL_OBJ_TYPE : +case NFTNL_OBJ_FAMILY : +case NFTNL_OBJ_USE : +case NFTNL_OBJ_HANDLE : +break ; +default : +break ; + } + + obj->flags &= ~(1 << attr); +} +static uint32_t nftnl_obj_validate[NFTNL_OBJ_MAX +1 ] = { [NFTNL_OBJ_FAMILY ] =sizeof (uint32_t ), [NFTNL_OBJ_USE ] =sizeof (uint32_t ),
Signature · 1 line
2.30.2
I manually applied this patch and got the following build error:
error: use of undeclared identifier 'nftnl_obj_unset'; did you mean 'nftnl_obj_set'
I think a declaration for nftnl_obj_unset() needs to be added to include/libnftnl/object.h. Other than that, this patch looks OK to me.
Regards,
Nicholas Vinson
Pablo Neira Ayuso
maintainerHi Nicholas,
Quoted 7 lines · Nicholas Vinson
I manually applied this patch and got the following build error:
error: use of undeclared identifier '
nftnl_obj_unset'; did you mean 'nftnl_obj_set'I think a declaration for
nftnl_obj_unset()needs to be added toinclude/libnftnl/object.h. Other than that, this patch looks OK to me.
$ git grep nftnl_obj_unset include/libnftnl/object.h:void nftnl_obj_unset(struct nftnl_obj *ne, uint16_t attr); src/libnftnl.map: nftnl_obj_unset; src/object.c:EXPORT_SYMBOL(nftnl_obj_unset); src/object.c:void nftnl_obj_unset(struct nftnl_obj *obj, uint16_t attr
the header file already has a declaration for this (which was part of 5573d0146c1a ("src: support for stateful objects").
What is missing then?
Thanks.
Quoted 16 lines · Pablo Neira Ayuso
Hi Nicholas,
Quoted 7 lines · Nicholas Vinson
I manually applied this patch and got the following build error:
error: use of undeclared identifier '
nftnl_obj_unset'; did you mean 'nftnl_obj_set'I think a declaration for
nftnl_obj_unset()needs to be added toinclude/libnftnl/object.h. Other than that, this patch looks OK to me.$ git grep nftnl_obj_unset include/libnftnl/object.h:void nftnl_obj_unset(struct nftnl_obj *ne, uint16_t attr); src/libnftnl.map: nftnl_obj_unset; src/object.c:EXPORT_SYMBOL(nftnl_obj_unset); src/object.c:void nftnl_obj_unset(struct nftnl_obj *obj, uint16_t attr
Quoted 4 lines
the header file already has a declaration for this (which was part of
5573d0146c1a("src: support for stateful objects").What is missing then?
A mistake on my part. I failed to revert to properly revert my patch before testing this change.
Everything looks good to me.
Thanks.
Quoted 2 lines
Thanks.