From patchwork Sat Jul 20 16:30:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1134403 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45rYK84myXz9sNC for ; Sun, 21 Jul 2019 02:31:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726659AbfGTQbI (ORCPT ); Sat, 20 Jul 2019 12:31:08 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:40910 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726300AbfGTQbI (ORCPT ); Sat, 20 Jul 2019 12:31:08 -0400 Received: from localhost ([::1]:54000 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1hosGI-0005TW-LE; Sat, 20 Jul 2019 18:31:06 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH 10/12] xtables-save: Pass format flags to do_output() Date: Sat, 20 Jul 2019 18:30:24 +0200 Message-Id: <20190720163026.15410-11-phil@nwl.cc> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190720163026.15410-1-phil@nwl.cc> References: <20190720163026.15410-1-phil@nwl.cc> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Let callers define the flags to pass to nft_rule_save() instead of just setting the counters boolean. Signed-off-by: Phil Sutter --- iptables/xtables-save.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c index 249b396091af4..980a80ff06f96 100644 --- a/iptables/xtables-save.c +++ b/iptables/xtables-save.c @@ -66,7 +66,7 @@ static const struct option ebt_save_options[] = { static bool ebt_legacy_counter_format; struct do_output_data { - bool counters; + unsigned int format; bool commit; }; @@ -98,7 +98,7 @@ __do_output(struct nft_handle *h, const char *tablename, void *data) /* Dump out chain names first, * thereby preventing dependency conflicts */ nft_chain_save(h, chain_list); - nft_rule_save(h, tablename, d->counters ? 0 : FMT_NOCOUNTS); + nft_rule_save(h, tablename, d->format); if (d->commit) printf("COMMIT\n"); @@ -139,7 +139,9 @@ xtables_save_main(int family, int argc, char *argv[], { const struct builtin_table *tables; const char *tablename = NULL; - struct do_output_data d = {}; + struct do_output_data d = { + .format = FMT_NOCOUNTS, + }; bool dump = false; struct nft_handle h = { .family = family, @@ -162,7 +164,7 @@ xtables_save_main(int family, int argc, char *argv[], fprintf(stderr, "-b/--binary option is not implemented\n"); break; case 'c': - d.counters = true; + d.format &= ~FMT_NOCOUNTS; break; case 't':