From 5d24b4686f7b3e3f3858afbc986d0d14c0ab044c Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 20 Feb 2017 16:14:42 +0100 Subject: object: extend set/get api for u8/u16 types Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- include/libnftnl/object.h | 4 ++++ src/libnftnl.map | 4 ++++ src/object.c | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/include/libnftnl/object.h b/include/libnftnl/object.h index 074a377..ca3abea 100644 --- a/include/libnftnl/object.h +++ b/include/libnftnl/object.h @@ -44,12 +44,16 @@ void nftnl_obj_unset(struct nftnl_obj *ne, uint16_t attr); void nftnl_obj_set_data(struct nftnl_obj *ne, uint16_t attr, const void *data, uint32_t data_len); void nftnl_obj_set(struct nftnl_obj *ne, uint16_t attr, const void *data); +void nftnl_obj_set_u8(struct nftnl_obj *ne, uint16_t attr, uint8_t val); +void nftnl_obj_set_u16(struct nftnl_obj *ne, uint16_t attr, uint16_t val); void nftnl_obj_set_u32(struct nftnl_obj *ne, uint16_t attr, uint32_t val); void nftnl_obj_set_u64(struct nftnl_obj *obj, uint16_t attr, uint64_t val); void nftnl_obj_set_str(struct nftnl_obj *ne, uint16_t attr, const char *str); const void *nftnl_obj_get_data(struct nftnl_obj *ne, uint16_t attr, uint32_t *data_len); const void *nftnl_obj_get(struct nftnl_obj *ne, uint16_t attr); +uint8_t nftnl_obj_get_u8(struct nftnl_obj *ne, uint16_t attr); +uint16_t nftnl_obj_get_u16(struct nftnl_obj *obj, uint16_t attr); uint32_t nftnl_obj_get_u32(struct nftnl_obj *ne, uint16_t attr); uint64_t nftnl_obj_get_u64(struct nftnl_obj *obj, uint16_t attr); const char *nftnl_obj_get_str(struct nftnl_obj *ne, uint16_t attr); diff --git a/src/libnftnl.map b/src/libnftnl.map index 4c08210..1892c98 100644 --- a/src/libnftnl.map +++ b/src/libnftnl.map @@ -278,9 +278,13 @@ global: nftnl_obj_unset; nftnl_obj_set; nftnl_obj_get; + nftnl_obj_set_u8; + nftnl_obj_set_u16; nftnl_obj_set_u32; nftnl_obj_set_u64; nftnl_obj_set_str; + nftnl_obj_get_u8; + nftnl_obj_get_u16; nftnl_obj_get_u32; nftnl_obj_get_str; nftnl_obj_get_u64; diff --git a/src/object.c b/src/object.c index 773eff6..e635f6a 100644 --- a/src/object.c +++ b/src/object.c @@ -107,6 +107,18 @@ void nftnl_obj_set(struct nftnl_obj *obj, uint16_t attr, const void *data) } EXPORT_SYMBOL(nftnl_obj_set); +void nftnl_obj_set_u8(struct nftnl_obj *obj, uint16_t attr, uint8_t val) +{ + nftnl_obj_set_data(obj, attr, &val, sizeof(uint8_t)); +} +EXPORT_SYMBOL(nftnl_obj_set_u8); + +void nftnl_obj_set_u16(struct nftnl_obj *obj, uint16_t attr, uint16_t val) +{ + nftnl_obj_set_data(obj, attr, &val, sizeof(uint16_t)); +} +EXPORT_SYMBOL(nftnl_obj_set_u16); + void nftnl_obj_set_u32(struct nftnl_obj *obj, uint16_t attr, uint32_t val) { nftnl_obj_set_data(obj, attr, &val, sizeof(uint32_t)); @@ -164,6 +176,20 @@ const void *nftnl_obj_get(struct nftnl_obj *obj, uint16_t attr) } EXPORT_SYMBOL(nftnl_obj_get); +uint8_t nftnl_obj_get_u8(struct nftnl_obj *obj, uint16_t attr) +{ + const void *ret = nftnl_obj_get(obj, attr); + return ret == NULL ? 0 : *((uint8_t *)ret); +} +EXPORT_SYMBOL(nftnl_obj_get_u8); + +uint16_t nftnl_obj_get_u16(struct nftnl_obj *obj, uint16_t attr) +{ + const void *ret = nftnl_obj_get(obj, attr); + return ret == NULL ? 0 : *((uint16_t *)ret); +} +EXPORT_SYMBOL(nftnl_obj_get_u16); + uint32_t nftnl_obj_get_u32(struct nftnl_obj *obj, uint16_t attr) { const void *ret = nftnl_obj_get(obj, attr); -- cgit v1.2.3