From 53c0ff324598ce2926236c32b2b4c858a0b3831a Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 25 Feb 2014 22:30:12 +0100 Subject: src: add nft_*_attr_{set|get}_data interface This patch adds two functions that allows you to validate the size of the attribute. This new functions provide a replacement for nft_rule_attr_set and nft_rule_attr_get. The data_len parameter was already passed to the {_set|_get} funcion in expressions. For consistency, add nft_rule_expr_{set|get}_data alias. Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/chain.h | 4 ++++ include/libnftnl/expr.h | 2 ++ include/libnftnl/rule.h | 4 ++++ include/libnftnl/set.h | 4 ++++ include/libnftnl/table.h | 4 ++++ 5 files changed, 18 insertions(+) (limited to 'include/libnftnl') diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h index 27de302..c11cb5e 100644 --- a/include/libnftnl/chain.h +++ b/include/libnftnl/chain.h @@ -36,6 +36,8 @@ enum { bool nft_chain_attr_is_set(const struct nft_chain *c, uint16_t attr); void nft_chain_attr_unset(struct nft_chain *c, uint16_t attr); void nft_chain_attr_set(struct nft_chain *t, uint16_t attr, const void *data); +void nft_chain_attr_set_data(struct nft_chain *t, uint16_t attr, + const void *data, uint32_t data_len); void nft_chain_attr_set_u8(struct nft_chain *t, uint16_t attr, uint8_t data); void nft_chain_attr_set_u32(struct nft_chain *t, uint16_t attr, uint32_t data); void nft_chain_attr_set_s32(struct nft_chain *t, uint16_t attr, int32_t data); @@ -43,6 +45,8 @@ void nft_chain_attr_set_u64(struct nft_chain *t, uint16_t attr, uint64_t data); void nft_chain_attr_set_str(struct nft_chain *t, uint16_t attr, const char *str); const void *nft_chain_attr_get(struct nft_chain *c, uint16_t attr); +const void *nft_chain_attr_get_data(struct nft_chain *c, uint16_t attr, + uint32_t *data_len); const char *nft_chain_attr_get_str(struct nft_chain *c, uint16_t attr); uint8_t nft_chain_attr_get_u8(struct nft_chain *c, uint16_t attr); uint32_t nft_chain_attr_get_u32(struct nft_chain *c, uint16_t attr); diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index 6ec05a6..2cfb4dc 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -21,6 +21,7 @@ void nft_rule_expr_free(struct nft_rule_expr *expr); bool nft_rule_expr_is_set(const struct nft_rule_expr *expr, uint16_t type); void nft_rule_expr_set(struct nft_rule_expr *expr, uint16_t type, const void *data, uint32_t data_len); +#define nft_rule_expr_set_data nft_rule_expr_set void nft_rule_expr_set_u8(struct nft_rule_expr *expr, uint16_t type, uint8_t data); void nft_rule_expr_set_u16(struct nft_rule_expr *expr, uint16_t type, uint16_t data); void nft_rule_expr_set_u32(struct nft_rule_expr *expr, uint16_t type, uint32_t data); @@ -28,6 +29,7 @@ void nft_rule_expr_set_u64(struct nft_rule_expr *expr, uint16_t type, uint64_t d void nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str); const void *nft_rule_expr_get(const struct nft_rule_expr *expr, uint16_t type, uint32_t *data_len); +#define nft_rule_expr_get_data nft_rule_expr_get uint8_t nft_rule_expr_get_u8(const struct nft_rule_expr *expr, uint16_t type); uint16_t nft_rule_expr_get_u16(const struct nft_rule_expr *expr, uint16_t type); uint32_t nft_rule_expr_get_u32(const struct nft_rule_expr *expr, uint16_t type); diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h index 13e6c14..9e6efaf 100644 --- a/include/libnftnl/rule.h +++ b/include/libnftnl/rule.h @@ -33,11 +33,15 @@ enum { void nft_rule_attr_unset(struct nft_rule *r, uint16_t attr); bool nft_rule_attr_is_set(const struct nft_rule *r, uint16_t attr); void nft_rule_attr_set(struct nft_rule *r, uint16_t attr, const void *data); +void nft_rule_attr_set_data(struct nft_rule *r, uint16_t attr, + const void *data, uint32_t data_len); void nft_rule_attr_set_u32(struct nft_rule *r, uint16_t attr, uint32_t val); void nft_rule_attr_set_u64(struct nft_rule *r, uint16_t attr, uint64_t val); void nft_rule_attr_set_str(struct nft_rule *r, uint16_t attr, const char *str); const void *nft_rule_attr_get(const struct nft_rule *r, uint16_t attr); +const void *nft_rule_attr_get_data(const struct nft_rule *r, uint16_t attr, + uint32_t *data_len); const char *nft_rule_attr_get_str(const struct nft_rule *r, uint16_t attr); uint8_t nft_rule_attr_get_u8(const struct nft_rule *r, uint16_t attr); uint32_t nft_rule_attr_get_u32(const struct nft_rule *r, uint16_t attr); diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h index ba11315..fcb1a7e 100644 --- a/include/libnftnl/set.h +++ b/include/libnftnl/set.h @@ -29,10 +29,14 @@ void nft_set_free(struct nft_set *s); bool nft_set_attr_is_set(const struct nft_set *s, uint16_t attr); void nft_set_attr_unset(struct nft_set *s, uint16_t attr); void nft_set_attr_set(struct nft_set *s, uint16_t attr, const void *data); +void nft_set_attr_set_data(struct nft_set *s, uint16_t attr, const void *data, + uint32_t data_len); void nft_set_attr_set_u32(struct nft_set *s, uint16_t attr, uint32_t val); void nft_set_attr_set_str(struct nft_set *s, uint16_t attr, const char *str); const void *nft_set_attr_get(struct nft_set *s, uint16_t attr); +const void *nft_set_attr_get_data(struct nft_set *s, uint16_t attr, + uint32_t *data_len); const char *nft_set_attr_get_str(struct nft_set *s, uint16_t attr); uint32_t nft_set_attr_get_u32(struct nft_set *s, uint16_t attr); diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h index 96f2668..fac79e7 100644 --- a/include/libnftnl/table.h +++ b/include/libnftnl/table.h @@ -29,7 +29,11 @@ enum { bool nft_table_attr_is_set(const struct nft_table *t, uint16_t attr); void nft_table_attr_unset(struct nft_table *t, uint16_t attr); void nft_table_attr_set(struct nft_table *t, uint16_t attr, const void *data); +void nft_table_attr_set_data(struct nft_table *t, uint16_t attr, + const void *data, uint32_t data_len); const void *nft_table_attr_get(struct nft_table *t, uint16_t attr); +const void *nft_table_attr_get_data(struct nft_table *t, uint16_t attr, + uint32_t *data_len); void nft_table_attr_set_u8(struct nft_table *t, uint16_t attr, uint8_t data); void nft_table_attr_set_u32(struct nft_table *t, uint16_t attr, uint32_t data); -- cgit v1.2.3