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 /src/expr/data_reg.c | |
| 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 'src/expr/data_reg.c')
| -rw-r--r-- | src/expr/data_reg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 193f3ab..76231af 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -300,13 +300,13 @@ int nft_data_reg_snprintf(char *buf, size_t size, union nft_data_reg *reg, switch(reg_type) { case DATA_VALUE: switch(output_format) { - case NFT_RULE_O_DEFAULT: + case NFT_OUTPUT_DEFAULT: return nft_data_reg_value_snprintf_default(buf, size, reg, flags); - case NFT_RULE_O_XML: + case NFT_OUTPUT_XML: return nft_data_reg_value_snprintf_xml(buf, size, reg, flags); - case NFT_RULE_O_JSON: + case NFT_OUTPUT_JSON: return nft_data_reg_value_snprintf_json(buf, size, reg, flags); default: @@ -314,15 +314,15 @@ int nft_data_reg_snprintf(char *buf, size_t size, union nft_data_reg *reg, } case DATA_VERDICT: switch(output_format) { - case NFT_RULE_O_DEFAULT: + case NFT_OUTPUT_DEFAULT: return snprintf(buf, size, "%d ", reg->verdict); - case NFT_RULE_O_XML: + case NFT_OUTPUT_XML: return snprintf(buf, size, "<data_reg type=\"verdict\">" "<verdict>%s</verdict>" "</data_reg>", nft_verdict2str(reg->verdict)); - case NFT_RULE_O_JSON: + case NFT_OUTPUT_JSON: return snprintf(buf, size, "\"data_reg\":{" "\"type\":\"verdict\"," @@ -333,14 +333,14 @@ int nft_data_reg_snprintf(char *buf, size_t size, union nft_data_reg *reg, } case DATA_CHAIN: switch(output_format) { - case NFT_RULE_O_DEFAULT: + case NFT_OUTPUT_DEFAULT: return snprintf(buf, size, "%s ", reg->chain); - case NFT_RULE_O_XML: + case NFT_OUTPUT_XML: return snprintf(buf, size, "<data_reg type=\"chain\">" "<chain>%s</chain>" "</data_reg>", reg->chain); - case NFT_RULE_O_JSON: + case NFT_OUTPUT_JSON: return snprintf(buf, size, "\"data_reg\":{\"type\":\"chain\"," "\"chain\":\"%s\"" |