diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-20 13:47:11 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-20 14:17:22 +0100 |
commit | 907a9f8e5a93f5bcd449643eb3916a656d634758 (patch) | |
tree | c195cc88bf73709d206a14c42902e3aa8555985f /include/libnftnl/ruleset.h | |
parent | 15615aa6ce1573da874f9795be8f66fbf886e638 (diff) |
src: get rid of aliases and compat
This machinery was introduced to avoid sudden compilation breakage of
old nftables releases. With the upcoming release of 0.7 (and 0.6 which
is now 6 months old) this is not required anymore. Moreover, users gain
nothing from older releases since they are half-boiled and buggy.
So let's get rid of aliases now. Bump LIBVERSION and update map file.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/libnftnl/ruleset.h')
-rw-r--r-- | include/libnftnl/ruleset.h | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/include/libnftnl/ruleset.h b/include/libnftnl/ruleset.h index 83c2334..fb40736 100644 --- a/include/libnftnl/ruleset.h +++ b/include/libnftnl/ruleset.h @@ -70,67 +70,6 @@ int nftnl_ruleset_parse_file(struct nftnl_ruleset *rs, enum nftnl_parse_type typ 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); -/* - * Compat - */ - -struct nft_ruleset; - -struct nft_ruleset *nft_ruleset_alloc(void); -void nft_ruleset_free(struct nft_ruleset *r); - -enum { - NFT_RULESET_ATTR_TABLELIST = 0, - NFT_RULESET_ATTR_CHAINLIST, - NFT_RULESET_ATTR_SETLIST, - NFT_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, -}; - -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); - -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, -}; - -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, - 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); - #ifdef __cplusplus } /* extern "C" */ #endif |