json: bitwise: add missing node len

I have added the len node in bitwise which was missing

Signed-off-by: Alvaro Neira Ayuso Ayuso <alvaroneay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index edc5a39a75079c0f3383cc630c48606e0ebdd3af..6c86acbdf4581efbe95a576d323546922b7268fa 100644 (file)
--- 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 825e474ecb9fa6bc41852ebdb97584951b62c843..4c354efce90dab8c5f7cf1289bc6cc4b3bd8788c 100644 (file)
--- 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);