| Message ID | 20240102132540.31391-1-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [libnftnl] object: define nftnl_obj_unset() | expand |
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
Hi Nicholas, On Tue, Jan 02, 2024 at 12:50:58PM -0500, Nicholas Vinson wrote: > 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. $ 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.
On 1/3/24 05:32, Pablo Neira Ayuso wrote: > Hi Nicholas, > > On Tue, Jan 02, 2024 at 12:50:58PM -0500, Nicholas Vinson wrote: >> 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. > $ 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? A mistake on my part. I failed to revert to properly revert my patch before testing this change. Everything looks good to me. Thanks. > > Thanks.
diff --git a/src/object.c b/src/object.c index 9e768610cddb..0814be744448 100644 --- a/src/object.c +++ b/src/object.c @@ -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),
For consistency with existing objects, implement this interface. This is already defined in libnftnl.map so the intention was to provide it. Fixes: 5573d0146c1a ("src: support for stateful objects") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- src/object.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)