From patchwork Thu Sep 7 17:41:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 811092 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xp76r38vsz9s83 for ; Fri, 8 Sep 2017 03:41:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752155AbdIGRlj (ORCPT ); Thu, 7 Sep 2017 13:41:39 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:35026 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770AbdIGRlj (ORCPT ); Thu, 7 Sep 2017 13:41:39 -0400 Received: from localhost ([::1]:57800 helo=xsao) by orbyte.nwl.cc with esmtp (Exim 4.89) (envelope-from ) id 1dq0o5-00016q-Fo; Thu, 07 Sep 2017 19:41:37 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [libnftnl PATCH] chain: Don't print unset policy value in netlink debug Date: Thu, 7 Sep 2017 19:41:27 +0200 Message-Id: <20170907174127.1909-1-phil@nwl.cc> X-Mailer: git-send-email 2.13.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The policy field was printed unconditionally, but if it wasn't set the default value 0 was printed as 'policy drop' which is not correct. Signed-off-by: Phil Sutter --- src/chain.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/chain.c b/src/chain.c index 29860c509a180..3190a775a0005 100644 --- a/src/chain.c +++ b/src/chain.c @@ -795,11 +795,19 @@ static int nftnl_chain_snprintf_default(char *buf, size_t size, SNPRINTF_BUFFER_SIZE(ret, size, len, offset); if (c->flags & (1 << NFTNL_CHAIN_HOOKNUM)) { - ret = snprintf(buf+offset, len, - " type %s hook %s prio %d policy %s " - "packets %"PRIu64" bytes %"PRIu64"", + ret = snprintf(buf+offset, len, " type %s hook %s prio %d", c->type, nftnl_hooknum2str(c->family, c->hooknum), - c->prio, nftnl_verdict2str(c->policy), + c->prio); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + if (c->flags & (1 << NFTNL_CHAIN_POLICY)) { + ret = snprintf(buf+offset, len, " policy %s", + nftnl_verdict2str(c->policy)); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + ret = snprintf(buf+offset, len, + " packets %"PRIu64" bytes %"PRIu64"", c->packets, c->bytes); SNPRINTF_BUFFER_SIZE(ret, size, len, offset);