diff options
| author | Álvaro Neira Ayuso <alvaroneay@gmail.com> | 2013-06-27 21:56:18 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-06-29 11:56:05 +0200 |
| commit | 4a684c2ee4cdff2c5c6bfa06d93b58cb4e868bf6 (patch) | |
| tree | 6216e645631bba685f1c17e0cce851d0c1c6c517 /src/expr/bitwise.c | |
| parent | caf4ac2e95a358f5b6ee64c4cc6c6c96a0bff24b (diff) | |
src: support JSON format in chain, rule and expressions
While at it, order possible switch cases of _snprintf.
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/bitwise.c')
| -rw-r--r-- | src/expr/bitwise.c | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 80c4f20..6843086 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -325,6 +325,37 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, char *xml) } static int +nft_rule_expr_bitwise_snprintf_json(char *buf, size_t size, + struct nft_expr_bitwise *bitwise) +{ + int len = size, offset = 0, ret; + + ret = snprintf(buf, len, "\"sreg\" : %u, " + "\"dreg\" : %u, ", + bitwise->sreg, bitwise->dreg); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, len, "\"mask\" : "); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->mask, + NFT_RULE_O_JSON, 0, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, len, ", \"xor\" : "); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->xor, + NFT_RULE_O_JSON, 0, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, len, "\""); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + return offset; +} + +static int nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, struct nft_expr_bitwise *bitwise) { @@ -389,11 +420,13 @@ nft_rule_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type, struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data; switch(type) { - case NFT_RULE_O_XML: - return nft_rule_expr_bitwise_snprintf_xml(buf, size, bitwise); case NFT_RULE_O_DEFAULT: return nft_rule_expr_bitwise_snprintf_default(buf, size, bitwise); + case NFT_RULE_O_XML: + return nft_rule_expr_bitwise_snprintf_xml(buf, size, bitwise); + case NFT_RULE_O_JSON: + return nft_rule_expr_bitwise_snprintf_json(buf, size, bitwise); default: break; } |