diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-24 19:15:04 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-24 19:19:05 +0200 |
| commit | cab61eabd957ae2004551704c5a048fcadcd0721 (patch) | |
| tree | 64a58cebaf9ec9e6e7939dd6f13c2159d124e5b3 | |
| parent | 2544625cd98163439cab76c972f9442edd9b7fd9 (diff) | |
expr: match: Do not print unset values in json file
It changes the parse and snprintf functions json to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/expr/match.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/expr/match.c b/src/expr/match.c index 604a8e6..2c4b3dc 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -177,10 +177,8 @@ static int nft_rule_expr_match_json_parse(struct nft_rule_expr *e, json_t *root, const char *name; name = nft_jansson_parse_str(root, "name", err); - if (name == NULL) - return -1; - - nft_rule_expr_set_str(e, NFT_EXPR_MT_NAME, name); + if (name != NULL) + nft_rule_expr_set_str(e, NFT_EXPR_MT_NAME, name); return 0; #else @@ -216,9 +214,10 @@ static int nft_rule_expr_match_snprintf_json(char *buf, size_t len, struct nft_expr_match *mt = nft_expr_data(e); int ret, size = len, offset = 0; - ret = snprintf(buf, len, "\"name\":\"%s\"", - mt->name); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_EXPR_MT_NAME)) { + ret = snprintf(buf, len, "\"name\":\"%s\"", mt->name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } return offset; } |