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/chain.h | 110 +++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'include/libnftnl/chain.h') 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" */ -- cgit v1.2.3