From 907a9f8e5a93f5bcd449643eb3916a656d634758 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 20 Dec 2016 13:47:11 +0100 Subject: 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 --- include/libnftnl/common.h | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) (limited to 'include/libnftnl/common.h') diff --git a/include/libnftnl/common.h b/include/libnftnl/common.h index a40688c..b9c6ff3 100644 --- a/include/libnftnl/common.h +++ b/include/libnftnl/common.h @@ -52,57 +52,4 @@ int nftnl_batch_is_supported(void); void nftnl_batch_begin(char *buf, uint32_t seq); void nftnl_batch_end(char *buf, uint32_t seq); -/* - * Compat - */ - -enum { - NFT_PARSE_EBADINPUT = 0, - NFT_PARSE_EMISSINGNODE, - NFT_PARSE_EBADTYPE, - NFT_PARSE_EOPNOTSUPP, -}; - -enum nft_output_type { - NFT_OUTPUT_DEFAULT = 0, - NFT_OUTPUT_XML, - NFT_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 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 nft_parse_type { - NFT_PARSE_NONE = 0, - NFT_PARSE_XML, - NFT_PARSE_JSON, - NFT_PARSE_MAX, -}; - -struct nft_parse_err; - -struct nlmsghdr *nft_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); - -int nft_batch_is_supported(void); -void nft_batch_begin(char *buf, uint32_t seq); -void nft_batch_end(char *buf, uint32_t seq); - #endif -- cgit v1.2.3