From patchwork Fri Aug 9 11:13:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alvaro Neira X-Patchwork-Id: 265996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0669D2C008E for ; Fri, 9 Aug 2013 21:13:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967729Ab3HILNK (ORCPT ); Fri, 9 Aug 2013 07:13:10 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:41174 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967573Ab3HILNJ (ORCPT ); Fri, 9 Aug 2013 07:13:09 -0400 Received: by mail-wi0-f172.google.com with SMTP id hj13so1515654wib.11 for ; Fri, 09 Aug 2013 04:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=JewGpGRnLTUDoNJutjvqJ9gXr9tw9YeyL+82EASvlUc=; b=acl8eemh68TLyTEPsOwj3Ij4u4wnUgvFu1iEaTeLZ2BlGw8pBwi8JFdcFWqPWVGRYJ m+Qw+z9FA0f+gplsr59IXDCkYZEkMgFl4UxQr8TPHyQNBA92N4Yj9eZkHgqUzf+qbFdQ jjAvzxJgfm0wuQ3Y3b8206NvNlc/oklop3PNtodwYKZf0mqra8ZJs+gConb3nKvt8Aq7 Jh0xIsVQ7FpYk/yDBmOQFasMlNn2l33dFpLS8ZX1Zo19CukwSIC9g1SEOvnpvOg/k2Ar AgnFb55Z0zr8C+gG5s7OC4jZjT/DL0NqocIrt2e9e+3f0vM8dOv201S4SSzcVz3Nb8G4 fl0A== X-Received: by 10.194.86.5 with SMTP id l5mr76295wjz.19.1376046788298; Fri, 09 Aug 2013 04:13:08 -0700 (PDT) Received: from [127.0.1.1] ([90.174.0.186]) by mx.google.com with ESMTPSA id a4sm2171615wik.11.2013.08.09.04.13.03 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 04:13:07 -0700 (PDT) Subject: [libnftables PATCH 06/13] json: bitwise: add missing node len To: netfilter-devel@vger.kernel.org From: Alvaro Neira Cc: eric@regit.org Date: Fri, 09 Aug 2013 13:13:00 +0200 Message-ID: <20130809111300.29819.10398.stgit@Ph0enix> In-Reply-To: <20130809111148.29819.95689.stgit@Ph0enix> References: <20130809111148.29819.95689.stgit@Ph0enix> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Álvaro Neira Ayuso I have added the len node in bitwise which was missing Signed-off-by: Alvaro Neira Ayuso --- src/expr/bitwise.c | 5 +++-- src/expr/data_reg.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);