From 760768890e60617acfd144dce875a4a3be14513c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Sep 2015 20:19:56 +0200 Subject: src: rename existing functions to use the nftnl_ prefix So we can use the nft_* prefix anytime soon for our upcoming higher level library. After this patch, the nft_* symbols become an alias of the nftnl_* symbols. Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/batch.h | 16 ++-- include/libnftnl/chain.h | 110 +++++++++++++------------- include/libnftnl/common.h | 66 ++++++++-------- include/libnftnl/expr.h | 192 ++++++++++++++++++++++----------------------- include/libnftnl/gen.h | 38 ++++----- include/libnftnl/rule.h | 112 +++++++++++++------------- include/libnftnl/ruleset.h | 86 ++++++++++---------- include/libnftnl/set.h | 190 ++++++++++++++++++++++---------------------- include/libnftnl/table.h | 84 ++++++++++---------- 9 files changed, 447 insertions(+), 447 deletions(-) (limited to 'include/libnftnl') diff --git a/include/libnftnl/batch.h b/include/libnftnl/batch.h index 40416e6..ea1ea66 100644 --- a/include/libnftnl/batch.h +++ b/include/libnftnl/batch.h @@ -3,16 +3,16 @@ #include -struct nft_batch; +struct nftnl_batch; -struct nft_batch *nft_batch_alloc(uint32_t pg_size, uint32_t pg_overrun_size); -int nft_batch_update(struct nft_batch *batch); -void nft_batch_free(struct nft_batch *batch); +struct nftnl_batch *nftnl_batch_alloc(uint32_t pg_size, uint32_t pg_overrun_size); +int nftnl_batch_update(struct nftnl_batch *batch); +void nftnl_batch_free(struct nftnl_batch *batch); -void *nft_batch_buffer(struct nft_batch *batch); -uint32_t nft_batch_buffer_len(struct nft_batch *batch); +void *nftnl_batch_buffer(struct nftnl_batch *batch); +uint32_t nftnl_batch_buffer_len(struct nftnl_batch *batch); -int nft_batch_iovec_len(struct nft_batch *batch); -void nft_batch_iovec(struct nft_batch *batch, struct iovec *iov, uint32_t iovlen); +int nftnl_batch_iovec_len(struct nftnl_batch *batch); +void nftnl_batch_iovec(struct nftnl_batch *batch, struct iovec *iov, uint32_t iovlen); #endif diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h index 3968e6b..1f426f7 100644 --- a/include/libnftnl/chain.h +++ b/include/libnftnl/chain.h @@ -12,78 +12,78 @@ extern "C" { #endif -struct nft_chain; +struct nftnl_chain; -struct nft_chain *nft_chain_alloc(void); -void nft_chain_free(struct nft_chain *); +struct nftnl_chain *nftnl_chain_alloc(void); +void nftnl_chain_free(struct nftnl_chain *); enum { - NFT_CHAIN_ATTR_NAME = 0, - NFT_CHAIN_ATTR_FAMILY, - NFT_CHAIN_ATTR_TABLE, - NFT_CHAIN_ATTR_HOOKNUM, - NFT_CHAIN_ATTR_PRIO = 4, - NFT_CHAIN_ATTR_POLICY, - NFT_CHAIN_ATTR_USE, - NFT_CHAIN_ATTR_BYTES, - NFT_CHAIN_ATTR_PACKETS = 8, - NFT_CHAIN_ATTR_HANDLE, - NFT_CHAIN_ATTR_TYPE, - NFT_CHAIN_ATTR_DEV, - __NFT_CHAIN_ATTR_MAX + NFTNL_CHAIN_ATTR_NAME = 0, + NFTNL_CHAIN_ATTR_FAMILY, + NFTNL_CHAIN_ATTR_TABLE, + NFTNL_CHAIN_ATTR_HOOKNUM, + NFTNL_CHAIN_ATTR_PRIO = 4, + NFTNL_CHAIN_ATTR_POLICY, + NFTNL_CHAIN_ATTR_USE, + NFTNL_CHAIN_ATTR_BYTES, + NFTNL_CHAIN_ATTR_PACKETS = 8, + NFTNL_CHAIN_ATTR_HANDLE, + NFTNL_CHAIN_ATTR_TYPE, + NFTNL_CHAIN_ATTR_DEV, + __NFTNL_CHAIN_ATTR_MAX }; -#define NFT_CHAIN_ATTR_MAX (__NFT_CHAIN_ATTR_MAX - 1) +#define NFTNL_CHAIN_ATTR_MAX (__NFTNL_CHAIN_ATTR_MAX - 1) -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, +bool nftnl_chain_attr_is_set(const struct nftnl_chain *c, uint16_t attr); +void nftnl_chain_attr_unset(struct nftnl_chain *c, uint16_t attr); +void nftnl_chain_attr_set(struct nftnl_chain *t, uint16_t attr, const void *data); +void nftnl_chain_attr_set_data(struct nftnl_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); -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, +void nftnl_chain_attr_set_u8(struct nftnl_chain *t, uint16_t attr, uint8_t data); +void nftnl_chain_attr_set_u32(struct nftnl_chain *t, uint16_t attr, uint32_t data); +void nftnl_chain_attr_set_s32(struct nftnl_chain *t, uint16_t attr, int32_t data); +void nftnl_chain_attr_set_u64(struct nftnl_chain *t, uint16_t attr, uint64_t data); +void nftnl_chain_attr_set_str(struct nftnl_chain *t, uint16_t attr, const char *str); + +const void *nftnl_chain_attr_get(struct nftnl_chain *c, uint16_t attr); +const void *nftnl_chain_attr_get_data(struct nftnl_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); -int32_t nft_chain_attr_get_s32(struct nft_chain *c, uint16_t attr); -uint64_t nft_chain_attr_get_u64(struct nft_chain *c, uint16_t attr); +const char *nftnl_chain_attr_get_str(struct nftnl_chain *c, uint16_t attr); +uint8_t nftnl_chain_attr_get_u8(struct nftnl_chain *c, uint16_t attr); +uint32_t nftnl_chain_attr_get_u32(struct nftnl_chain *c, uint16_t attr); +int32_t nftnl_chain_attr_get_s32(struct nftnl_chain *c, uint16_t attr); +uint64_t nftnl_chain_attr_get_u64(struct nftnl_chain *c, uint16_t attr); struct nlmsghdr; -void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain *t); +void nftnl_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_chain *t); -int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_chain_parse_file(struct nft_chain *c, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *t, uint32_t type, uint32_t flags); -int nft_chain_fprintf(FILE *fp, struct nft_chain *c, uint32_t type, uint32_t flags); +int nftnl_chain_parse(struct nftnl_chain *c, enum nftnl_parse_type type, + const char *data, struct nftnl_parse_err *err); +int nftnl_chain_parse_file(struct nftnl_chain *c, enum nftnl_parse_type type, + FILE *fp, struct nftnl_parse_err *err); +int nftnl_chain_snprintf(char *buf, size_t size, struct nftnl_chain *t, uint32_t type, uint32_t flags); +int nftnl_chain_fprintf(FILE *fp, struct nftnl_chain *c, uint32_t type, uint32_t flags); -#define nft_chain_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *t); +#define nftnl_chain_nlmsg_build_hdr nftnl_nlmsg_build_hdr +int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *t); -struct nft_chain_list; +struct nftnl_chain_list; -struct nft_chain_list *nft_chain_list_alloc(void); -void nft_chain_list_free(struct nft_chain_list *list); -int nft_chain_list_is_empty(struct nft_chain_list *list); -int nft_chain_list_foreach(struct nft_chain_list *chain_list, int (*cb)(struct nft_chain *t, void *data), void *data); +struct nftnl_chain_list *nftnl_chain_list_alloc(void); +void nftnl_chain_list_free(struct nftnl_chain_list *list); +int nftnl_chain_list_is_empty(struct nftnl_chain_list *list); +int nftnl_chain_list_foreach(struct nftnl_chain_list *chain_list, int (*cb)(struct nftnl_chain *t, void *data), void *data); -void nft_chain_list_add(struct nft_chain *r, struct nft_chain_list *list); -void nft_chain_list_add_tail(struct nft_chain *r, struct nft_chain_list *list); -void nft_chain_list_del(struct nft_chain *c); +void nftnl_chain_list_add(struct nftnl_chain *r, struct nftnl_chain_list *list); +void nftnl_chain_list_add_tail(struct nftnl_chain *r, struct nftnl_chain_list *list); +void nftnl_chain_list_del(struct nftnl_chain *c); -struct nft_chain_list_iter; +struct nftnl_chain_list_iter; -struct nft_chain_list_iter *nft_chain_list_iter_create(struct nft_chain_list *l); -struct nft_chain *nft_chain_list_iter_next(struct nft_chain_list_iter *iter); -void nft_chain_list_iter_destroy(struct nft_chain_list_iter *iter); +struct nftnl_chain_list_iter *nftnl_chain_list_iter_create(struct nftnl_chain_list *l); +struct nftnl_chain *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *iter); +void nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter); #ifdef __cplusplus } /* extern "C" */ diff --git a/include/libnftnl/common.h b/include/libnftnl/common.h index 14db823..b9c6ff3 100644 --- a/include/libnftnl/common.h +++ b/include/libnftnl/common.h @@ -4,52 +4,52 @@ #include enum { - NFT_PARSE_EBADINPUT = 0, - NFT_PARSE_EMISSINGNODE, - NFT_PARSE_EBADTYPE, - NFT_PARSE_EOPNOTSUPP, + NFTNL_PARSE_EBADINPUT = 0, + NFTNL_PARSE_EMISSINGNODE, + NFTNL_PARSE_EBADTYPE, + NFTNL_PARSE_EOPNOTSUPP, }; -enum nft_output_type { - NFT_OUTPUT_DEFAULT = 0, - NFT_OUTPUT_XML, - NFT_OUTPUT_JSON, +enum nftnl_output_type { + NFTNL_OUTPUT_DEFAULT = 0, + NFTNL_OUTPUT_XML, + NFTNL_OUTPUT_JSON, }; -enum nft_output_flags { - NFT_OF_EVENT_NEW = (1 << 0), - NFT_OF_EVENT_DEL = (1 << 1), - NFT_OF_EVENT_ANY = (NFT_OF_EVENT_NEW | NFT_OF_EVENT_DEL), +enum nftnl_output_flags { + NFTNL_OF_EVENT_NEW = (1 << 0), + NFTNL_OF_EVENT_DEL = (1 << 1), + NFTNL_OF_EVENT_ANY = (NFTNL_OF_EVENT_NEW | NFTNL_OF_EVENT_DEL), }; -enum nft_cmd_type { - NFT_CMD_UNSPEC = 0, - NFT_CMD_ADD, - NFT_CMD_INSERT, - NFT_CMD_DELETE, - NFT_CMD_REPLACE, - NFT_CMD_FLUSH, - NFT_CMD_MAX, +enum nftnl_cmd_type { + NFTNL_CMD_UNSPEC = 0, + NFTNL_CMD_ADD, + NFTNL_CMD_INSERT, + NFTNL_CMD_DELETE, + NFTNL_CMD_REPLACE, + NFTNL_CMD_FLUSH, + NFTNL_CMD_MAX, }; -enum nft_parse_type { - NFT_PARSE_NONE = 0, - NFT_PARSE_XML, - NFT_PARSE_JSON, - NFT_PARSE_MAX, +enum nftnl_parse_type { + NFTNL_PARSE_NONE = 0, + NFTNL_PARSE_XML, + NFTNL_PARSE_JSON, + NFTNL_PARSE_MAX, }; -struct nft_parse_err; +struct nftnl_parse_err; -struct nlmsghdr *nft_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, +struct nlmsghdr *nftnl_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq); -struct nft_parse_err *nft_parse_err_alloc(void); -void nft_parse_err_free(struct nft_parse_err *); -int nft_parse_perror(const char *str, struct nft_parse_err *err); +struct nftnl_parse_err *nftnl_parse_err_alloc(void); +void nftnl_parse_err_free(struct nftnl_parse_err *); +int nftnl_parse_perror(const char *str, struct nftnl_parse_err *err); -int nft_batch_is_supported(void); -void nft_batch_begin(char *buf, uint32_t seq); -void nft_batch_end(char *buf, uint32_t seq); +int nftnl_batch_is_supported(void); +void nftnl_batch_begin(char *buf, uint32_t seq); +void nftnl_batch_end(char *buf, uint32_t seq); #endif diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index 59ae2d7..1ca1d8b 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -9,168 +9,168 @@ extern "C" { #endif -struct nft_rule_expr; +struct nftnl_rule_expr; enum { - NFT_RULE_EXPR_ATTR_NAME = 0, - NFT_RULE_EXPR_ATTR_BASE, + NFTNL_RULE_EXPR_ATTR_NAME = 0, + NFTNL_RULE_EXPR_ATTR_BASE, }; -struct nft_rule_expr *nft_rule_expr_alloc(const char *name); -void nft_rule_expr_free(struct nft_rule_expr *expr); +struct nftnl_rule_expr *nftnl_rule_expr_alloc(const char *name); +void nftnl_rule_expr_free(struct nftnl_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); -void nft_rule_expr_set_u64(struct nft_rule_expr *expr, uint16_t type, uint64_t data); -void nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str); +bool nftnl_rule_expr_is_set(const struct nftnl_rule_expr *expr, uint16_t type); +void nftnl_rule_expr_set(struct nftnl_rule_expr *expr, uint16_t type, const void *data, uint32_t data_len); +#define nftnl_rule_expr_set_data nftnl_rule_expr_set +void nftnl_rule_expr_set_u8(struct nftnl_rule_expr *expr, uint16_t type, uint8_t data); +void nftnl_rule_expr_set_u16(struct nftnl_rule_expr *expr, uint16_t type, uint16_t data); +void nftnl_rule_expr_set_u32(struct nftnl_rule_expr *expr, uint16_t type, uint32_t data); +void nftnl_rule_expr_set_u64(struct nftnl_rule_expr *expr, uint16_t type, uint64_t data); +void nftnl_rule_expr_set_str(struct nftnl_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); -uint64_t nft_rule_expr_get_u64(const struct nft_rule_expr *expr, uint16_t type); -const char *nft_rule_expr_get_str(const struct nft_rule_expr *expr, uint16_t type); +const void *nftnl_rule_expr_get(const struct nftnl_rule_expr *expr, uint16_t type, uint32_t *data_len); +#define nftnl_rule_expr_get_data nftnl_rule_expr_get +uint8_t nftnl_rule_expr_get_u8(const struct nftnl_rule_expr *expr, uint16_t type); +uint16_t nftnl_rule_expr_get_u16(const struct nftnl_rule_expr *expr, uint16_t type); +uint32_t nftnl_rule_expr_get_u32(const struct nftnl_rule_expr *expr, uint16_t type); +uint64_t nftnl_rule_expr_get_u64(const struct nftnl_rule_expr *expr, uint16_t type); +const char *nftnl_rule_expr_get_str(const struct nftnl_rule_expr *expr, uint16_t type); -int nft_rule_expr_snprintf(char *buf, size_t buflen, struct nft_rule_expr *expr, uint32_t type, uint32_t flags); +int nftnl_rule_expr_snprintf(char *buf, size_t buflen, struct nftnl_rule_expr *expr, uint32_t type, uint32_t flags); enum { - NFT_EXPR_PAYLOAD_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_PAYLOAD_BASE, - NFT_EXPR_PAYLOAD_OFFSET, - NFT_EXPR_PAYLOAD_LEN, + NFTNL_EXPR_PAYLOAD_DREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_PAYLOAD_BASE, + NFTNL_EXPR_PAYLOAD_OFFSET, + NFTNL_EXPR_PAYLOAD_LEN, }; enum { - NFT_EXPR_META_KEY = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_META_DREG, - NFT_EXPR_META_SREG, + NFTNL_EXPR_META_KEY = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_META_DREG, + NFTNL_EXPR_META_SREG, }; enum { - NFT_EXPR_CMP_SREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_CMP_OP, - NFT_EXPR_CMP_DATA, + NFTNL_EXPR_CMP_SREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_CMP_OP, + NFTNL_EXPR_CMP_DATA, }; enum { - NFT_EXPR_IMM_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_IMM_DATA, - NFT_EXPR_IMM_VERDICT, - NFT_EXPR_IMM_CHAIN, + NFTNL_EXPR_IMM_DREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_IMM_DATA, + NFTNL_EXPR_IMM_VERDICT, + NFTNL_EXPR_IMM_CHAIN, }; enum { - NFT_EXPR_CTR_PACKETS = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_CTR_BYTES, + NFTNL_EXPR_CTR_PACKETS = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_CTR_BYTES, }; enum { - NFT_EXPR_BITWISE_SREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_BITWISE_DREG, - NFT_EXPR_BITWISE_LEN, - NFT_EXPR_BITWISE_MASK, - NFT_EXPR_BITWISE_XOR, + NFTNL_EXPR_BITWISE_SREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_BITWISE_DREG, + NFTNL_EXPR_BITWISE_LEN, + NFTNL_EXPR_BITWISE_MASK, + NFTNL_EXPR_BITWISE_XOR, }; enum { - NFT_EXPR_TG_NAME = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_TG_REV, - NFT_EXPR_TG_INFO, + NFTNL_EXPR_TG_NAME = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_TG_REV, + NFTNL_EXPR_TG_INFO, }; enum { - NFT_EXPR_MT_NAME = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_MT_REV, - NFT_EXPR_MT_INFO, + NFTNL_EXPR_MT_NAME = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_MT_REV, + NFTNL_EXPR_MT_INFO, }; enum { - NFT_EXPR_NAT_TYPE = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_NAT_FAMILY, - NFT_EXPR_NAT_REG_ADDR_MIN, - NFT_EXPR_NAT_REG_ADDR_MAX, - NFT_EXPR_NAT_REG_PROTO_MIN, - NFT_EXPR_NAT_REG_PROTO_MAX, - NFT_EXPR_NAT_FLAGS, + NFTNL_EXPR_NAT_TYPE = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_NAT_FAMILY, + NFTNL_EXPR_NAT_REG_ADDR_MIN, + NFTNL_EXPR_NAT_REG_ADDR_MAX, + NFTNL_EXPR_NAT_REG_PROTO_MIN, + NFTNL_EXPR_NAT_REG_PROTO_MAX, + NFTNL_EXPR_NAT_FLAGS, }; enum { - NFT_EXPR_LOOKUP_SREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_LOOKUP_DREG, - NFT_EXPR_LOOKUP_SET, - NFT_EXPR_LOOKUP_SET_ID, + NFTNL_EXPR_LOOKUP_SREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_LOOKUP_DREG, + NFTNL_EXPR_LOOKUP_SET, + NFTNL_EXPR_LOOKUP_SET_ID, }; enum { - NFT_EXPR_DYNSET_SREG_KEY = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_DYNSET_SREG_DATA, - NFT_EXPR_DYNSET_OP, - NFT_EXPR_DYNSET_TIMEOUT, - NFT_EXPR_DYNSET_SET_NAME, - NFT_EXPR_DYNSET_SET_ID, - NFT_EXPR_DYNSET_EXPR, + NFTNL_EXPR_DYNSET_SREG_KEY = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_DYNSET_SREG_DATA, + NFTNL_EXPR_DYNSET_OP, + NFTNL_EXPR_DYNSET_TIMEOUT, + NFTNL_EXPR_DYNSET_SET_NAME, + NFTNL_EXPR_DYNSET_SET_ID, + NFTNL_EXPR_DYNSET_EXPR, }; enum { - NFT_EXPR_LOG_PREFIX = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_LOG_GROUP, - NFT_EXPR_LOG_SNAPLEN, - NFT_EXPR_LOG_QTHRESHOLD, - NFT_EXPR_LOG_LEVEL, - NFT_EXPR_LOG_FLAGS, + NFTNL_EXPR_LOG_PREFIX = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_LOG_GROUP, + NFTNL_EXPR_LOG_SNAPLEN, + NFTNL_EXPR_LOG_QTHRESHOLD, + NFTNL_EXPR_LOG_LEVEL, + NFTNL_EXPR_LOG_FLAGS, }; enum { - NFT_EXPR_EXTHDR_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_EXTHDR_TYPE, - NFT_EXPR_EXTHDR_OFFSET, - NFT_EXPR_EXTHDR_LEN, + NFTNL_EXPR_EXTHDR_DREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_EXTHDR_TYPE, + NFTNL_EXPR_EXTHDR_OFFSET, + NFTNL_EXPR_EXTHDR_LEN, }; enum { - NFT_EXPR_CT_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_CT_KEY, - NFT_EXPR_CT_DIR, - NFT_EXPR_CT_SREG, + NFTNL_EXPR_CT_DREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_CT_KEY, + NFTNL_EXPR_CT_DIR, + NFTNL_EXPR_CT_SREG, }; enum { - NFT_EXPR_BYTEORDER_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_BYTEORDER_SREG, - NFT_EXPR_BYTEORDER_OP, - NFT_EXPR_BYTEORDER_LEN, - NFT_EXPR_BYTEORDER_SIZE, + NFTNL_EXPR_BYTEORDER_DREG = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_BYTEORDER_SREG, + NFTNL_EXPR_BYTEORDER_OP, + NFTNL_EXPR_BYTEORDER_LEN, + NFTNL_EXPR_BYTEORDER_SIZE, }; enum { - NFT_EXPR_LIMIT_RATE = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_LIMIT_UNIT, + NFTNL_EXPR_LIMIT_RATE = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_LIMIT_UNIT, }; enum { - NFT_EXPR_REJECT_TYPE = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_REJECT_CODE, + NFTNL_EXPR_REJECT_TYPE = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_REJECT_CODE, }; enum { - NFT_EXPR_QUEUE_NUM = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_QUEUE_TOTAL, - NFT_EXPR_QUEUE_FLAGS, + NFTNL_EXPR_QUEUE_NUM = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_QUEUE_TOTAL, + NFTNL_EXPR_QUEUE_FLAGS, }; enum { - NFT_EXPR_MASQ_FLAGS = NFT_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_MASQ_FLAGS = NFTNL_RULE_EXPR_ATTR_BASE, }; enum { - NFT_EXPR_REDIR_REG_PROTO_MIN = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_REDIR_REG_PROTO_MAX, - NFT_EXPR_REDIR_FLAGS, + NFTNL_EXPR_REDIR_REG_PROTO_MIN = NFTNL_RULE_EXPR_ATTR_BASE, + NFTNL_EXPR_REDIR_REG_PROTO_MAX, + NFTNL_EXPR_REDIR_FLAGS, }; #ifdef __cplusplus diff --git a/include/libnftnl/gen.h b/include/libnftnl/gen.h index 00753b0..eb72d56 100644 --- a/include/libnftnl/gen.h +++ b/include/libnftnl/gen.h @@ -12,37 +12,37 @@ extern "C" { #endif -struct nft_gen; +struct nftnl_gen; -struct nft_gen *nft_gen_alloc(void); -void nft_gen_free(struct nft_gen *); +struct nftnl_gen *nftnl_gen_alloc(void); +void nftnl_gen_free(struct nftnl_gen *); enum { - NFT_GEN_ID = 0, - __NFT_GEN_MAX + NFTNL_GEN_ID = 0, + __NFTNL_GEN_MAX }; -#define NFT_GEN_MAX (__NFT_GEN_MAX - 1) +#define NFTNL_GEN_MAX (__NFTNL_GEN_MAX - 1) -bool nft_gen_attr_is_set(const struct nft_gen *gen, uint16_t attr); -void nft_gen_attr_unset(struct nft_gen *gen, uint16_t attr); -void nft_gen_attr_set(struct nft_gen *gen, uint16_t attr, const void *data); -void nft_gen_attr_set_data(struct nft_gen *gen, uint16_t attr, +bool nftnl_gen_attr_is_set(const struct nftnl_gen *gen, uint16_t attr); +void nftnl_gen_attr_unset(struct nftnl_gen *gen, uint16_t attr); +void nftnl_gen_attr_set(struct nftnl_gen *gen, uint16_t attr, const void *data); +void nftnl_gen_attr_set_data(struct nftnl_gen *gen, uint16_t attr, const void *data, uint32_t data_len); -const void *nft_gen_attr_get(struct nft_gen *gen, uint16_t attr); -const void *nft_gen_attr_get_data(struct nft_gen *gen, uint16_t attr, +const void *nftnl_gen_attr_get(struct nftnl_gen *gen, uint16_t attr); +const void *nftnl_gen_attr_get_data(struct nftnl_gen *gen, uint16_t attr, uint32_t *data_len); -void nft_gen_attr_set_u32(struct nft_gen *gen, uint16_t attr, uint32_t data); -uint32_t nft_gen_attr_get_u32(struct nft_gen *gen, uint16_t attr); +void nftnl_gen_attr_set_u32(struct nftnl_gen *gen, uint16_t attr, uint32_t data); +uint32_t nftnl_gen_attr_get_u32(struct nftnl_gen *gen, uint16_t attr); struct nlmsghdr; -int nft_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_gen *gen); +int nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen); -int nft_gen_snprintf(char *buf, size_t size, struct nft_gen *gen, uint32_t type, uint32_t flags); -int nft_gen_fprintf(FILE *fp, struct nft_gen *gen, uint32_t type, uint32_t flags); +int nftnl_gen_snprintf(char *buf, size_t size, struct nftnl_gen *gen, uint32_t type, uint32_t flags); +int nftnl_gen_fprintf(FILE *fp, struct nftnl_gen *gen, uint32_t type, uint32_t flags); -#define nft_gen_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_gen *gen); +#define nftnl_gen_nlmsg_build_hdr nftnl_nlmsg_build_hdr +int nftnl_gen_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_gen *gen); #ifdef __cplusplus } /* extern "C" */ diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h index 62dba59..8aa47ea 100644 --- a/include/libnftnl/rule.h +++ b/include/libnftnl/rule.h @@ -12,84 +12,84 @@ extern "C" { #endif -struct nft_rule; -struct nft_rule_expr; +struct nftnl_rule; +struct nftnl_rule_expr; -struct nft_rule *nft_rule_alloc(void); -void nft_rule_free(struct nft_rule *); +struct nftnl_rule *nftnl_rule_alloc(void); +void nftnl_rule_free(struct nftnl_rule *); enum { - NFT_RULE_ATTR_FAMILY = 0, - NFT_RULE_ATTR_TABLE, - NFT_RULE_ATTR_CHAIN, - NFT_RULE_ATTR_HANDLE, - NFT_RULE_ATTR_COMPAT_PROTO, - NFT_RULE_ATTR_COMPAT_FLAGS, - NFT_RULE_ATTR_POSITION, - NFT_RULE_ATTR_USERDATA, - __NFT_RULE_ATTR_MAX + NFTNL_RULE_ATTR_FAMILY = 0, + NFTNL_RULE_ATTR_TABLE, + NFTNL_RULE_ATTR_CHAIN, + NFTNL_RULE_ATTR_HANDLE, + NFTNL_RULE_ATTR_COMPAT_PROTO, + NFTNL_RULE_ATTR_COMPAT_FLAGS, + NFTNL_RULE_ATTR_POSITION, + NFTNL_RULE_ATTR_USERDATA, + __NFTNL_RULE_ATTR_MAX }; -#define NFT_RULE_ATTR_MAX (__NFT_RULE_ATTR_MAX - 1) +#define NFTNL_RULE_ATTR_MAX (__NFTNL_RULE_ATTR_MAX - 1) -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, +void nftnl_rule_attr_unset(struct nftnl_rule *r, uint16_t attr); +bool nftnl_rule_attr_is_set(const struct nftnl_rule *r, uint16_t attr); +void nftnl_rule_attr_set(struct nftnl_rule *r, uint16_t attr, const void *data); +void nftnl_rule_attr_set_data(struct nftnl_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); +void nftnl_rule_attr_set_u32(struct nftnl_rule *r, uint16_t attr, uint32_t val); +void nftnl_rule_attr_set_u64(struct nftnl_rule *r, uint16_t attr, uint64_t val); +void nftnl_rule_attr_set_str(struct nftnl_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, +const void *nftnl_rule_attr_get(const struct nftnl_rule *r, uint16_t attr); +const void *nftnl_rule_attr_get_data(const struct nftnl_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); -uint64_t nft_rule_attr_get_u64(const struct nft_rule *r, uint16_t attr); +const char *nftnl_rule_attr_get_str(const struct nftnl_rule *r, uint16_t attr); +uint8_t nftnl_rule_attr_get_u8(const struct nftnl_rule *r, uint16_t attr); +uint32_t nftnl_rule_attr_get_u32(const struct nftnl_rule *r, uint16_t attr); +uint64_t nftnl_rule_attr_get_u64(const struct nftnl_rule *r, uint16_t attr); -void nft_rule_add_expr(struct nft_rule *r, struct nft_rule_expr *expr); +void nftnl_rule_add_expr(struct nftnl_rule *r, struct nftnl_rule_expr *expr); struct nlmsghdr; -void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *t); +void nftnl_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_rule *t); -int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_rule_parse_file(struct nft_rule *r, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags); -int nft_rule_fprintf(FILE *fp, struct nft_rule *r, uint32_t type, uint32_t flags); +int nftnl_rule_parse(struct nftnl_rule *r, enum nftnl_parse_type type, + const char *data, struct nftnl_parse_err *err); +int nftnl_rule_parse_file(struct nftnl_rule *r, enum nftnl_parse_type type, + FILE *fp, struct nftnl_parse_err *err); +int nftnl_rule_snprintf(char *buf, size_t size, struct nftnl_rule *t, uint32_t type, uint32_t flags); +int nftnl_rule_fprintf(FILE *fp, struct nftnl_rule *r, uint32_t type, uint32_t flags); -#define nft_rule_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *t); +#define nftnl_rule_nlmsg_build_hdr nftnl_nlmsg_build_hdr +int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *t); -int nft_rule_expr_foreach(struct nft_rule *r, - int (*cb)(struct nft_rule_expr *e, void *data), +int nftnl_rule_expr_foreach(struct nftnl_rule *r, + int (*cb)(struct nftnl_rule_expr *e, void *data), void *data); -struct nft_rule_expr_iter; +struct nftnl_rule_expr_iter; -struct nft_rule_expr_iter *nft_rule_expr_iter_create(struct nft_rule *r); -struct nft_rule_expr *nft_rule_expr_iter_next(struct nft_rule_expr_iter *iter); -void nft_rule_expr_iter_destroy(struct nft_rule_expr_iter *iter); +struct nftnl_rule_expr_iter *nftnl_rule_expr_iter_create(struct nftnl_rule *r); +struct nftnl_rule_expr *nftnl_rule_expr_iter_next(struct nftnl_rule_expr_iter *iter); +void nftnl_rule_expr_iter_destroy(struct nftnl_rule_expr_iter *iter); -struct nft_rule_list; +struct nftnl_rule_list; -struct nft_rule_list *nft_rule_list_alloc(void); -void nft_rule_list_free(struct nft_rule_list *list); -int nft_rule_list_is_empty(struct nft_rule_list *list); -void nft_rule_list_add(struct nft_rule *r, struct nft_rule_list *list); -void nft_rule_list_add_tail(struct nft_rule *r, struct nft_rule_list *list); -void nft_rule_list_del(struct nft_rule *r); -int nft_rule_list_foreach(struct nft_rule_list *rule_list, int (*cb)(struct nft_rule *t, void *data), void *data); +struct nftnl_rule_list *nftnl_rule_list_alloc(void); +void nftnl_rule_list_free(struct nftnl_rule_list *list); +int nftnl_rule_list_is_empty(struct nftnl_rule_list *list); +void nftnl_rule_list_add(struct nftnl_rule *r, struct nftnl_rule_list *list); +void nftnl_rule_list_add_tail(struct nftnl_rule *r, struct nftnl_rule_list *list); +void nftnl_rule_list_del(struct nftnl_rule *r); +int nftnl_rule_list_foreach(struct nftnl_rule_list *rule_list, int (*cb)(struct nftnl_rule *t, void *data), void *data); -struct nft_rule_list_iter; +struct nftnl_rule_list_iter; -struct nft_rule_list_iter *nft_rule_list_iter_create(struct nft_rule_list *l); -struct nft_rule *nft_rule_list_iter_cur(struct nft_rule_list_iter *iter); -struct nft_rule *nft_rule_list_iter_next(struct nft_rule_list_iter *iter); -void nft_rule_list_iter_destroy(struct nft_rule_list_iter *iter); +struct nftnl_rule_list_iter *nftnl_rule_list_iter_create(struct nftnl_rule_list *l); +struct nftnl_rule *nftnl_rule_list_iter_cur(struct nftnl_rule_list_iter *iter); +struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter); +void nftnl_rule_list_iter_destroy(struct nftnl_rule_list_iter *iter); #ifdef __cplusplus } /* extern "C" */ diff --git a/include/libnftnl/ruleset.h b/include/libnftnl/ruleset.h index fe5e44f..12e2495 100644 --- a/include/libnftnl/ruleset.h +++ b/include/libnftnl/ruleset.h @@ -13,62 +13,62 @@ extern "C" { #endif -struct nft_ruleset; +struct nftnl_ruleset; -struct nft_ruleset *nft_ruleset_alloc(void); -void nft_ruleset_free(struct nft_ruleset *r); +struct nftnl_ruleset *nftnl_ruleset_alloc(void); +void nftnl_ruleset_free(struct nftnl_ruleset *r); enum { - NFT_RULESET_ATTR_TABLELIST = 0, - NFT_RULESET_ATTR_CHAINLIST, - NFT_RULESET_ATTR_SETLIST, - NFT_RULESET_ATTR_RULELIST, + NFTNL_RULESET_ATTR_TABLELIST = 0, + NFTNL_RULESET_ATTR_CHAINLIST, + NFTNL_RULESET_ATTR_SETLIST, + NFTNL_RULESET_ATTR_RULELIST, }; -enum nft_ruleset_type { - NFT_RULESET_UNSPEC = 0, - NFT_RULESET_RULESET, - NFT_RULESET_TABLE, - NFT_RULESET_CHAIN, - NFT_RULESET_RULE, - NFT_RULESET_SET, - NFT_RULESET_SET_ELEMS, +enum nftnl_ruleset_type { + NFTNL_RULESET_UNSPEC = 0, + NFTNL_RULESET_RULESET, + NFTNL_RULESET_TABLE, + NFTNL_RULESET_CHAIN, + NFTNL_RULESET_RULE, + NFTNL_RULESET_SET, + NFTNL_RULESET_SET_ELEMS, }; -bool nft_ruleset_attr_is_set(const struct nft_ruleset *r, uint16_t attr); -void nft_ruleset_attr_unset(struct nft_ruleset *r, uint16_t attr); -void nft_ruleset_attr_set(struct nft_ruleset *r, uint16_t attr, void *data); -void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr); +bool nftnl_ruleset_attr_is_set(const struct nftnl_ruleset *r, uint16_t attr); +void nftnl_ruleset_attr_unset(struct nftnl_ruleset *r, uint16_t attr); +void nftnl_ruleset_attr_set(struct nftnl_ruleset *r, uint16_t attr, void *data); +void *nftnl_ruleset_attr_get(const struct nftnl_ruleset *r, uint16_t attr); enum { - NFT_RULESET_CTX_CMD = 0, - NFT_RULESET_CTX_TYPE, - NFT_RULESET_CTX_TABLE, - NFT_RULESET_CTX_CHAIN, - NFT_RULESET_CTX_RULE, - NFT_RULESET_CTX_SET, - NFT_RULESET_CTX_DATA, + NFTNL_RULESET_CTX_CMD = 0, + NFTNL_RULESET_CTX_TYPE, + NFTNL_RULESET_CTX_TABLE, + NFTNL_RULESET_CTX_CHAIN, + NFTNL_RULESET_CTX_RULE, + NFTNL_RULESET_CTX_SET, + NFTNL_RULESET_CTX_DATA, }; -struct nft_parse_ctx; -void nft_ruleset_ctx_free(const struct nft_parse_ctx *ctx); -bool nft_ruleset_ctx_is_set(const struct nft_parse_ctx *ctx, uint16_t attr); -void *nft_ruleset_ctx_get(const struct nft_parse_ctx *ctx, uint16_t attr); -uint32_t nft_ruleset_ctx_get_u32(const struct nft_parse_ctx *ctx, +struct nftnl_parse_ctx; +void nftnl_ruleset_ctx_free(const struct nftnl_parse_ctx *ctx); +bool nftnl_ruleset_ctx_is_set(const struct nftnl_parse_ctx *ctx, uint16_t attr); +void *nftnl_ruleset_ctx_get(const struct nftnl_parse_ctx *ctx, uint16_t attr); +uint32_t nftnl_ruleset_ctx_get_u32(const struct nftnl_parse_ctx *ctx, uint16_t attr); -int nft_ruleset_parse_file_cb(enum nft_parse_type type, FILE *fp, - struct nft_parse_err *err, void *data, - int (*cb)(const struct nft_parse_ctx *ctx)); -int nft_ruleset_parse_buffer_cb(enum nft_parse_type type, const char *buffer, - struct nft_parse_err *err, void *data, - int (*cb)(const struct nft_parse_ctx *ctx)); -int nft_ruleset_parse(struct nft_ruleset *rs, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_ruleset_parse_file(struct nft_ruleset *rs, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_ruleset_snprintf(char *buf, size_t size, const struct nft_ruleset *rs, uint32_t type, uint32_t flags); -int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type, uint32_t flags); +int nftnl_ruleset_parse_file_cb(enum nftnl_parse_type type, FILE *fp, + struct nftnl_parse_err *err, void *data, + int (*cb)(const struct nftnl_parse_ctx *ctx)); +int nftnl_ruleset_parse_buffer_cb(enum nftnl_parse_type type, const char *buffer, + struct nftnl_parse_err *err, void *data, + int (*cb)(const struct nftnl_parse_ctx *ctx)); +int nftnl_ruleset_parse(struct nftnl_ruleset *rs, enum nftnl_parse_type type, + const char *data, struct nftnl_parse_err *err); +int nftnl_ruleset_parse_file(struct nftnl_ruleset *rs, enum nftnl_parse_type type, + FILE *fp, struct nftnl_parse_err *err); +int nftnl_ruleset_snprintf(char *buf, size_t size, const struct nftnl_ruleset *rs, uint32_t type, uint32_t flags); +int nftnl_ruleset_fprintf(FILE *fp, const struct nftnl_ruleset *rs, uint32_t type, uint32_t flags); #ifdef __cplusplus } /* extern "C" */ diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h index 4efc7d4..d3958f6 100644 --- a/include/libnftnl/set.h +++ b/include/libnftnl/set.h @@ -9,135 +9,135 @@ #include enum { - NFT_SET_ATTR_TABLE, - NFT_SET_ATTR_NAME, - NFT_SET_ATTR_FLAGS, - NFT_SET_ATTR_KEY_TYPE, - NFT_SET_ATTR_KEY_LEN, - NFT_SET_ATTR_DATA_TYPE, - NFT_SET_ATTR_DATA_LEN, - NFT_SET_ATTR_FAMILY, - NFT_SET_ATTR_ID, - NFT_SET_ATTR_POLICY, - NFT_SET_ATTR_DESC_SIZE, - NFT_SET_ATTR_TIMEOUT, - NFT_SET_ATTR_GC_INTERVAL, - __NFT_SET_ATTR_MAX + NFTNL_SET_ATTR_TABLE, + NFTNL_SET_ATTR_NAME, + NFTNL_SET_ATTR_FLAGS, + NFTNL_SET_ATTR_KEY_TYPE, + NFTNL_SET_ATTR_KEY_LEN, + NFTNL_SET_ATTR_DATA_TYPE, + NFTNL_SET_ATTR_DATA_LEN, + NFTNL_SET_ATTR_FAMILY, + NFTNL_SET_ATTR_ID, + NFTNL_SET_ATTR_POLICY, + NFTNL_SET_ATTR_DESC_SIZE, + NFTNL_SET_ATTR_TIMEOUT, + NFTNL_SET_ATTR_GC_INTERVAL, + __NFTNL_SET_ATTR_MAX }; -#define NFT_SET_ATTR_MAX (__NFT_SET_ATTR_MAX - 1) +#define NFTNL_SET_ATTR_MAX (__NFTNL_SET_ATTR_MAX - 1) -struct nft_set; +struct nftnl_set; -struct nft_set *nft_set_alloc(void); -void nft_set_free(struct nft_set *s); +struct nftnl_set *nftnl_set_alloc(void); +void nftnl_set_free(struct nftnl_set *s); -struct nft_set *nft_set_clone(const struct nft_set *set); +struct nftnl_set *nftnl_set_clone(const struct nftnl_set *set); -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, +bool nftnl_set_attr_is_set(const struct nftnl_set *s, uint16_t attr); +void nftnl_set_attr_unset(struct nftnl_set *s, uint16_t attr); +void nftnl_set_attr_set(struct nftnl_set *s, uint16_t attr, const void *data); +void nftnl_set_attr_set_data(struct nftnl_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_u64(struct nft_set *s, uint16_t attr, uint64_t val); -void nft_set_attr_set_str(struct nft_set *s, uint16_t attr, const char *str); +void nftnl_set_attr_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val); +void nftnl_set_attr_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val); +void nftnl_set_attr_set_str(struct nftnl_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, +const void *nftnl_set_attr_get(struct nftnl_set *s, uint16_t attr); +const void *nftnl_set_attr_get_data(struct nftnl_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); -uint64_t nft_set_attr_get_u64(struct nft_set *s, uint16_t attr); +const char *nftnl_set_attr_get_str(struct nftnl_set *s, uint16_t attr); +uint32_t nftnl_set_attr_get_u32(struct nftnl_set *s, uint16_t attr); +uint64_t nftnl_set_attr_get_u64(struct nftnl_set *s, uint16_t attr); struct nlmsghdr; -#define nft_set_nlmsg_build_hdr nft_nlmsg_build_hdr -void nft_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s); -int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s); -int nft_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s); +#define nftnl_set_nlmsg_build_hdr nftnl_nlmsg_build_hdr +void nftnl_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s); +int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s); +int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s); -int nft_set_snprintf(char *buf, size_t size, struct nft_set *s, uint32_t type, uint32_t flags); -int nft_set_fprintf(FILE *fp, struct nft_set *s, uint32_t type, uint32_t flags); +int nftnl_set_snprintf(char *buf, size_t size, struct nftnl_set *s, uint32_t type, uint32_t flags); +int nftnl_set_fprintf(FILE *fp, struct nftnl_set *s, uint32_t type, uint32_t flags); -struct nft_set_list; +struct nftnl_set_list; -struct nft_set_list *nft_set_list_alloc(void); -void nft_set_list_free(struct nft_set_list *list); -int nft_set_list_is_empty(struct nft_set_list *list); -void nft_set_list_add(struct nft_set *s, struct nft_set_list *list); -void nft_set_list_add_tail(struct nft_set *s, struct nft_set_list *list); -void nft_set_list_del(struct nft_set *s); -int nft_set_list_foreach(struct nft_set_list *set_list, int (*cb)(struct nft_set *t, void *data), void *data); +struct nftnl_set_list *nftnl_set_list_alloc(void); +void nftnl_set_list_free(struct nftnl_set_list *list); +int nftnl_set_list_is_empty(struct nftnl_set_list *list); +void nftnl_set_list_add(struct nftnl_set *s, struct nftnl_set_list *list); +void nftnl_set_list_add_tail(struct nftnl_set *s, struct nftnl_set_list *list); +void nftnl_set_list_del(struct nftnl_set *s); +int nftnl_set_list_foreach(struct nftnl_set_list *set_list, int (*cb)(struct nftnl_set *t, void *data), void *data); -struct nft_set_list_iter; -struct nft_set_list_iter *nft_set_list_iter_create(struct nft_set_list *l); -struct nft_set *nft_set_list_iter_cur(struct nft_set_list_iter *iter); -struct nft_set *nft_set_list_iter_next(struct nft_set_list_iter *iter); -void nft_set_list_iter_destroy(struct nft_set_list_iter *iter); +struct nftnl_set_list_iter; +struct nftnl_set_list_iter *nftnl_set_list_iter_create(struct nftnl_set_list *l); +struct nftnl_set *nftnl_set_list_iter_cur(struct nftnl_set_list_iter *iter); +struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter); +void nftnl_set_list_iter_destroy(struct nftnl_set_list_iter *iter); -int nft_set_parse(struct nft_set *s, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_set_parse_file(struct nft_set *s, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); +int nftnl_set_parse(struct nftnl_set *s, enum nftnl_parse_type type, + const char *data, struct nftnl_parse_err *err); +int nftnl_set_parse_file(struct nftnl_set *s, enum nftnl_parse_type type, + FILE *fp, struct nftnl_parse_err *err); /* * Set elements */ enum { - NFT_SET_ELEM_ATTR_FLAGS, - NFT_SET_ELEM_ATTR_KEY, - NFT_SET_ELEM_ATTR_VERDICT, - NFT_SET_ELEM_ATTR_CHAIN, - NFT_SET_ELEM_ATTR_DATA, - NFT_SET_ELEM_ATTR_TIMEOUT, - NFT_SET_ELEM_ATTR_EXPIRATION, - NFT_SET_ELEM_ATTR_USERDATA, - NFT_SET_ELEM_ATTR_EXPR, + NFTNL_SET_ELEM_ATTR_FLAGS, + NFTNL_SET_ELEM_ATTR_KEY, + NFTNL_SET_ELEM_ATTR_VERDICT, + NFTNL_SET_ELEM_ATTR_CHAIN, + NFTNL_SET_ELEM_ATTR_DATA, + NFTNL_SET_ELEM_ATTR_TIMEOUT, + NFTNL_SET_ELEM_ATTR_EXPIRATION, + NFTNL_SET_ELEM_ATTR_USERDATA, + NFTNL_SET_ELEM_ATTR_EXPR, }; -struct nft_set_elem; +struct nftnl_set_elem; -struct nft_set_elem *nft_set_elem_alloc(void); -void nft_set_elem_free(struct nft_set_elem *s); +struct nftnl_set_elem *nftnl_set_elem_alloc(void); +void nftnl_set_elem_free(struct nftnl_set_elem *s); -struct nft_set_elem *nft_set_elem_clone(struct nft_set_elem *elem); +struct nftnl_set_elem *nftnl_set_elem_clone(struct nftnl_set_elem *elem); -void nft_set_elem_add(struct nft_set *s, struct nft_set_elem *elem); +void nftnl_set_elem_add(struct nftnl_set *s, struct nftnl_set_elem *elem); -void nft_set_elem_attr_unset(struct nft_set_elem *s, uint16_t attr); -void nft_set_elem_attr_set(struct nft_set_elem *s, uint16_t attr, const void *data, uint32_t data_len); -void nft_set_elem_attr_set_u32(struct nft_set_elem *s, uint16_t attr, uint32_t val); -void nft_set_elem_attr_set_u64(struct nft_set_elem *s, uint16_t attr, uint64_t val); -void nft_set_elem_attr_set_str(struct nft_set_elem *s, uint16_t attr, const char *str); +void nftnl_set_elem_attr_unset(struct nftnl_set_elem *s, uint16_t attr); +void nftnl_set_elem_attr_set(struct nftnl_set_elem *s, uint16_t attr, const void *data, uint32_t data_len); +void nftnl_set_elem_attr_set_u32(struct nftnl_set_elem *s, uint16_t attr, uint32_t val); +void nftnl_set_elem_attr_set_u64(struct nftnl_set_elem *s, uint16_t attr, uint64_t val); +void nftnl_set_elem_attr_set_str(struct nftnl_set_elem *s, uint16_t attr, const char *str); -const void *nft_set_elem_attr_get(struct nft_set_elem *s, uint16_t attr, uint32_t *data_len); -const char *nft_set_elem_attr_get_str(struct nft_set_elem *s, uint16_t attr); -uint32_t nft_set_elem_attr_get_u32(struct nft_set_elem *s, uint16_t attr); -uint64_t nft_set_elem_attr_get_u64(struct nft_set_elem *s, uint16_t attr); +const void *nftnl_set_elem_attr_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t *data_len); +const char *nftnl_set_elem_attr_get_str(struct nftnl_set_elem *s, uint16_t attr); +uint32_t nftnl_set_elem_attr_get_u32(struct nftnl_set_elem *s, uint16_t attr); +uint64_t nftnl_set_elem_attr_get_u64(struct nftnl_set_elem *s, uint16_t attr); -bool nft_set_elem_attr_is_set(const struct nft_set_elem *s, uint16_t attr); +bool nftnl_set_elem_attr_is_set(const struct nftnl_set_elem *s, uint16_t attr); -#define nft_set_elem_nlmsg_build_hdr nft_nlmsg_build_hdr -void nft_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s); -void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set_elem *e); +#define nftnl_set_elem_nlmsg_build_hdr nftnl_nlmsg_build_hdr +void nftnl_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set *s); +void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nftnl_set_elem *e); -int nft_set_elem_parse(struct nft_set_elem *e, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_set_elem_parse_file(struct nft_set_elem *e, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *s, uint32_t type, uint32_t flags); -int nft_set_elem_fprintf(FILE *fp, struct nft_set_elem *se, uint32_t type, uint32_t flags); +int nftnl_set_elem_parse(struct nftnl_set_elem *e, enum nftnl_parse_type type, + const char *data, struct nftnl_parse_err *err); +int nftnl_set_elem_parse_file(struct nftnl_set_elem *e, enum nftnl_parse_type type, + FILE *fp, struct nftnl_parse_err *err); +int nftnl_set_elem_snprintf(char *buf, size_t size, struct nftnl_set_elem *s, uint32_t type, uint32_t flags); +int nftnl_set_elem_fprintf(FILE *fp, struct nftnl_set_elem *se, uint32_t type, uint32_t flags); -int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set_elem *e, void *data), void *data); +int nftnl_set_elem_foreach(struct nftnl_set *s, int (*cb)(struct nftnl_set_elem *e, void *data), void *data); -struct nft_set_elems_iter; -struct nft_set_elems_iter *nft_set_elems_iter_create(struct nft_set *s); -struct nft_set_elem *nft_set_elems_iter_cur(struct nft_set_elems_iter *iter); -struct nft_set_elem *nft_set_elems_iter_next(struct nft_set_elems_iter *iter); -void nft_set_elems_iter_destroy(struct nft_set_elems_iter *iter); +struct nftnl_set_elems_iter; +struct nftnl_set_elems_iter *nftnl_set_elems_iter_create(struct nftnl_set *s); +struct nftnl_set_elem *nftnl_set_elems_iter_cur(struct nftnl_set_elems_iter *iter); +struct nftnl_set_elem *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *iter); +void nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter); -int nft_set_elems_nlmsg_build_payload_iter(struct nlmsghdr *nlh, - struct nft_set_elems_iter *iter); +int nftnl_set_elems_nlmsg_build_payload_iter(struct nlmsghdr *nlh, + struct nftnl_set_elems_iter *iter); #endif /* _LIBNFTNL_SET_H_ */ diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h index fac79e7..0f0589b 100644 --- a/include/libnftnl/table.h +++ b/include/libnftnl/table.h @@ -12,66 +12,66 @@ extern "C" { #endif -struct nft_table; +struct nftnl_table; -struct nft_table *nft_table_alloc(void); -void nft_table_free(struct nft_table *); +struct nftnl_table *nftnl_table_alloc(void); +void nftnl_table_free(struct nftnl_table *); enum { - NFT_TABLE_ATTR_NAME = 0, - NFT_TABLE_ATTR_FAMILY, - NFT_TABLE_ATTR_FLAGS, - NFT_TABLE_ATTR_USE, - __NFT_TABLE_ATTR_MAX + NFTNL_TABLE_ATTR_NAME = 0, + NFTNL_TABLE_ATTR_FAMILY, + NFTNL_TABLE_ATTR_FLAGS, + NFTNL_TABLE_ATTR_USE, + __NFTNL_TABLE_ATTR_MAX }; -#define NFT_TABLE_ATTR_MAX (__NFT_TABLE_ATTR_MAX - 1) +#define NFTNL_TABLE_ATTR_MAX (__NFTNL_TABLE_ATTR_MAX - 1) -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, +bool nftnl_table_attr_is_set(const struct nftnl_table *t, uint16_t attr); +void nftnl_table_attr_unset(struct nftnl_table *t, uint16_t attr); +void nftnl_table_attr_set(struct nftnl_table *t, uint16_t attr, const void *data); +void nftnl_table_attr_set_data(struct nftnl_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, +const void *nftnl_table_attr_get(struct nftnl_table *t, uint16_t attr); +const void *nftnl_table_attr_get_data(struct nftnl_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); -void nft_table_attr_set_str(struct nft_table *t, uint16_t attr, const char *str); -uint8_t nft_table_attr_get_u8(struct nft_table *t, uint16_t attr); -uint32_t nft_table_attr_get_u32(struct nft_table *t, uint16_t attr); -const char *nft_table_attr_get_str(struct nft_table *t, uint16_t attr); +void nftnl_table_attr_set_u8(struct nftnl_table *t, uint16_t attr, uint8_t data); +void nftnl_table_attr_set_u32(struct nftnl_table *t, uint16_t attr, uint32_t data); +void nftnl_table_attr_set_str(struct nftnl_table *t, uint16_t attr, const char *str); +uint8_t nftnl_table_attr_get_u8(struct nftnl_table *t, uint16_t attr); +uint32_t nftnl_table_attr_get_u32(struct nftnl_table *t, uint16_t attr); +const char *nftnl_table_attr_get_str(struct nftnl_table *t, uint16_t attr); struct nlmsghdr; -void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table *t); +void nftnl_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nftnl_table *t); -int nft_table_parse(struct nft_table *t, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_table_parse_file(struct nft_table *t, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, uint32_t type, uint32_t flags); -int nft_table_fprintf(FILE *fp, struct nft_table *t, uint32_t type, uint32_t flags); +int nftnl_table_parse(struct nftnl_table *t, enum nftnl_parse_type type, + const char *data, struct nftnl_parse_err *err); +int nftnl_table_parse_file(struct nftnl_table *t, enum nftnl_parse_type type, + FILE *fp, struct nftnl_parse_err *err); +int nftnl_table_snprintf(char *buf, size_t size, struct nftnl_table *t, uint32_t type, uint32_t flags); +int nftnl_table_fprintf(FILE *fp, struct nftnl_table *t, uint32_t type, uint32_t flags); -#define nft_table_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t); +#define nftnl_table_nlmsg_build_hdr nftnl_nlmsg_build_hdr +int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t); -struct nft_table_list; +struct nftnl_table_list; -struct nft_table_list *nft_table_list_alloc(void); -void nft_table_list_free(struct nft_table_list *list); -int nft_table_list_is_empty(struct nft_table_list *list); -int nft_table_list_foreach(struct nft_table_list *table_list, int (*cb)(struct nft_table *t, void *data), void *data); +struct nftnl_table_list *nftnl_table_list_alloc(void); +void nftnl_table_list_free(struct nftnl_table_list *list); +int nftnl_table_list_is_empty(struct nftnl_table_list *list); +int nftnl_table_list_foreach(struct nftnl_table_list *table_list, int (*cb)(struct nftnl_table *t, void *data), void *data); -void nft_table_list_add(struct nft_table *r, struct nft_table_list *list); -void nft_table_list_add_tail(struct nft_table *r, struct nft_table_list *list); -void nft_table_list_del(struct nft_table *r); +void nftnl_table_list_add(struct nftnl_table *r, struct nftnl_table_list *list); +void nftnl_table_list_add_tail(struct nftnl_table *r, struct nftnl_table_list *list); +void nftnl_table_list_del(struct nftnl_table *r); -struct nft_table_list_iter; +struct nftnl_table_list_iter; -struct nft_table_list_iter *nft_table_list_iter_create(struct nft_table_list *l); -struct nft_table *nft_table_list_iter_next(struct nft_table_list_iter *iter); -void nft_table_list_iter_destroy(struct nft_table_list_iter *iter); +struct nftnl_table_list_iter *nftnl_table_list_iter_create(struct nftnl_table_list *l); +struct nftnl_table *nftnl_table_list_iter_next(struct nftnl_table_list_iter *iter); +void nftnl_table_list_iter_destroy(struct nftnl_table_list_iter *iter); #ifdef __cplusplus } /* extern "C" */ -- cgit v1.2.3