diff options
author | Ana Rey <anarey@gmail.com> | 2014-06-04 13:38:11 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-05 15:23:01 +0200 |
commit | c0ff83d7b03222c8c634a80b42883c1aebe8764d (patch) | |
tree | e8827fcaa74455d1127a37120801ffcd56d1d622 | |
parent | 020a53391fb9c86390b802892a3b7486d09b1b2c (diff) |
expr: reject: Do not print unset values in json
It changes the parse and the snprint functions to omit unset values.
If It uses this rule:
nft add rule ip test output input
It gets this json file:
[...] "expr":[{"type":"reject","type":0,"code":0}]}
Now, That rule creates this json file without null values:
[...] "expr":[{"type":"reject"}]}
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | src/expr/reject.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/src/expr/reject.c b/src/expr/reject.c index 8b688ec..2a1285b 100644 --- a/src/expr/reject.c +++ b/src/expr/reject.c @@ -129,15 +129,11 @@ nft_rule_expr_reject_json_parse(struct nft_rule_expr *e, json_t *root, uint32_t type; uint8_t code; - if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) < 0) - return -1; - - nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type); - - if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) < 0) - return -1; + if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type); - nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code); + if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) == 0) + nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code); return 0; #else @@ -201,11 +197,24 @@ static int nft_rule_expr_reject_snprintf_xml(char *buf, size_t len, static int nft_rule_expr_reject_snprintf_json(char *buf, size_t len, struct nft_rule_expr *e) { + int ret, size = len, offset = 0; struct nft_expr_reject *reject = nft_expr_data(e); - return snprintf(buf, len, "\"type\":%u," - "\"code\":%u,", - reject->type, reject->icmp_code); + if (e->flags & (1 << NFT_EXPR_REJECT_TYPE)) { + ret = snprintf(buf+offset, len, "\"type\":%u,", + reject->type); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_REJECT_CODE)) { + ret = snprintf(buf+offset, len, "\"code\":%u,", + reject->icmp_code); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (offset > 0) + offset--; + + return offset; } static int |