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