From 76a30eaecb210f1806031f873767798be5414c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= Date: Fri, 9 Aug 2013 13:13:00 +0200 Subject: json: bitwise: add missing node len I have added the len node in bitwise which was missing Signed-off-by: Alvaro Neira Ayuso Ayuso Signed-off-by: Pablo Neira Ayuso --- src/expr/bitwise.c | 5 +++-- src/expr/data_reg.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index edc5a39..6c86acb 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -238,8 +238,9 @@ nft_rule_expr_bitwise_snprintf_json(char *buf, size_t size, int len = size, offset = 0, ret; ret = snprintf(buf, len, "\"sreg\" : %u, " - "\"dreg\" : %u, ", - bitwise->sreg, bitwise->dreg); + "\"dreg\" : %u, " + "\"len\" : %u, ", + bitwise->sreg, bitwise->dreg, bitwise->len); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = snprintf(buf+offset, len, "\"mask\" : {"); diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 825e474..4c354ef 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -250,10 +250,10 @@ nft_data_reg_value_snprintf_json(char *buf, size_t size, SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - ret = snprintf(buf+offset, len, "\""); + ret = snprintf(buf+offset, len, "\", "); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - + offset -= 2; ret = snprintf(buf+offset, len, "}"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); -- cgit v1.2.3