summaryrefslogtreecommitdiffstats
path: root/src/expr/meta.c
diff options
context:
space:
mode:
authorÁlvaro Neira Ayuso <alvaroneay@gmail.com>2013-11-11 21:09:35 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2013-11-14 00:38:38 +0100
commit989b793a3bf689757b2b8f08a1c264743d75fa0f (patch)
tree8a932779feb9b906282cc929ad0cab30799c8176 /src/expr/meta.c
parent838ae8f60f43061778ce1b7f08cb08fc60fd21f9 (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/meta.c')
-rw-r--r--src/expr/meta.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr/meta.c b/src/expr/meta.c
index beeb8ca..88d2908 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -231,14 +231,14 @@ nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,
struct nft_expr_meta *meta = nft_expr_data(e);
switch(type) {
- case NFT_RULE_O_DEFAULT:
+ case NFT_OUTPUT_DEFAULT:
return snprintf(buf, len, "load %s => reg %u ",
meta_key2str(meta->key), meta->dreg);
- case NFT_RULE_O_XML:
+ case NFT_OUTPUT_XML:
return snprintf(buf, len, "<dreg>%u</dreg>"
"<key>%s</key>",
meta->dreg, meta_key2str(meta->key));
- case NFT_RULE_O_JSON:
+ case NFT_OUTPUT_JSON:
return snprintf(buf, len, "\"dreg\":%u,"
"\"key\":\"%s\"",
meta->dreg, meta_key2str(meta->key));