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/ruleset.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/ruleset.h')
| -rw-r--r-- | include/libnftables/ruleset.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/libnftables/ruleset.h b/include/libnftables/ruleset.h index 3b20bfa..71ef3b1 100644 --- a/include/libnftables/ruleset.h +++ b/include/libnftables/ruleset.h @@ -7,6 +7,8 @@ #include <stdint.h> #include <sys/types.h> +#include <libnftables/common.h> + #ifdef __cplusplus extern "C" { #endif @@ -28,20 +30,7 @@ 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); const void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr); -enum { - NFT_RULESET_O_DEFAULT = 0, - NFT_RULESET_O_XML, - NFT_RULESET_O_JSON, -}; - -enum nft_ruleset_parse_type { - NFT_RULESET_PARSE_NONE = 0, - NFT_RULESET_PARSE_XML, - NFT_RULESET_PARSE_JSON, - NFT_RULESET_PARSE_MAX, -}; - -int nft_ruleset_parse(struct nft_ruleset *rs, enum nft_ruleset_parse_type type, const char *data); +int nft_ruleset_parse(struct nft_ruleset *rs, enum nft_parse_type type, const char *data); 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); |