diff options
| author | Álvaro Neira Ayuso <alvaroneay@gmail.com> | 2013-11-11 21:09:35 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-11-14 00:38:38 +0100 |
| commit | 989b793a3bf689757b2b8f08a1c264743d75fa0f (patch) | |
| tree | 8a932779feb9b906282cc929ad0cab30799c8176 /include/libnftables/chain.h | |
| parent | 838ae8f60f43061778ce1b7f08cb08fc60fd21f9 (diff) | |
src: unify parse and output types
Unify parse and output types that are redundant to all
existing nftables objects. Thus, all NFT_*_O_[XML|JSON|DEFAULT]
are merged into NFT_OUTPUT_[JSON|XML] and NFT_PARSE_[JSON|XML].
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/libnftables/chain.h')
| -rw-r--r-- | include/libnftables/chain.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h index 5de7318..c26b348 100644 --- a/include/libnftables/chain.h +++ b/include/libnftables/chain.h @@ -6,6 +6,8 @@ #include <stdbool.h> #include <sys/types.h> +#include <libnftables/common.h> + #ifdef __cplusplus extern "C" { #endif @@ -47,20 +49,7 @@ struct nlmsghdr; void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain *t); -enum { - NFT_CHAIN_O_DEFAULT = 0, - NFT_CHAIN_O_XML, - NFT_CHAIN_O_JSON, -}; - -enum nft_chain_parse_type { - NFT_CHAIN_PARSE_NONE = 0, - NFT_CHAIN_PARSE_XML, - NFT_CHAIN_PARSE_JSON, - NFT_CHAIN_PARSE_MAX -}; - -int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type, const char *data); +int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type, const char *data); 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); |