From: Giuseppe Longo <giuseppelng@gmail.com>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH v3 2/2] xtables: function zero_entries removed
Date: Mon, 17 Jun 2013 11:26:11 +0200 [thread overview]
Message-ID: <20130617092611.2814.61698.stgit@localhost> (raw)
In-Reply-To: <20130617092600.2814.15883.stgit@localhost>
Signed-off-by: Giuseppe Longo <giuseppelng@gmail.com>
---
iptables/xtables.c | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/iptables/xtables.c b/iptables/xtables.c
index a06988e..cfc91e4 100644
--- a/iptables/xtables.c
+++ b/iptables/xtables.c
@@ -549,14 +549,6 @@ check_entry(const char *chain, const char *table,
}
static int
-zero_entries(const xt_chainlabel chain, int verbose,
- struct xtc_handle *handle)
-{
- /* XXX iterate over chains and reset counters */
- return 1;
-}
-
-static int
list_entries(struct nft_handle *h, const char *chain, const char *table,
int rulenum, int verbose, int numeric, int expanded,
int linenumbers)
@@ -1171,8 +1163,7 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table)
ret = nft_rule_flush(h, chain, *table);
break;
case CMD_ZERO:
- /* FIXME */
-// ret = zero_entries(chain, cs.options&OPT_VERBOSE, *handle);
+ ret = nft_chain_zero_counters(h, chain, *table);
break;
case CMD_ZERO_NUM:
/* FIXME */
@@ -1188,22 +1179,16 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table)
cs.options&OPT_NUMERIC,
cs.options&OPT_EXPANDED,
cs.options&OPT_LINENUMBERS);
-/* if (ret && (command & CMD_ZERO))
- ret = zero_entries(chain,
- cs.options&OPT_VERBOSE, *handle);
- if (ret && (command & CMD_ZERO_NUM))
- ret = iptc_zero_counter(chain, rulenum, *handle); */
+ if (ret && (command & CMD_ZERO))
+ ret = nft_chain_zero_counters(h, chain, *table);
break;
case CMD_LIST_RULES:
case CMD_LIST_RULES|CMD_ZERO:
case CMD_LIST_RULES|CMD_ZERO_NUM:
/* FIXME */
ret = list_rules(h, chain, *table, rulenum, cs.options&OPT_VERBOSE);
-/* if (ret && (command & CMD_ZERO))
- ret = zero_entries(chain,
- cs.options&OPT_VERBOSE, *handle);
- if (ret && (command & CMD_ZERO_NUM))
- ret = iptc_zero_counter(chain, rulenum, *handle); */
+ if (ret && (command & CMD_ZERO))
+ ret = nft_chain_zero_counters(h, chain, *table);
break;
case CMD_NEW_CHAIN:
ret = nft_chain_user_add(h, chain, *table);
next prev parent reply other threads:[~2013-06-17 9:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 9:26 [PATCH v3 1/2] iptables-nftables: function nft_chain_zero_counters added Giuseppe Longo
2013-06-17 9:26 ` Giuseppe Longo [this message]
2013-06-17 10:13 ` Tomasz Bursztyka
2013-06-17 11:29 ` Pablo Neira Ayuso
2013-06-17 12:22 ` Giuseppe Longo
2013-06-17 12:41 ` Tomasz Bursztyka
2013-06-17 13:17 ` Giuseppe Longo
2013-06-18 4:50 ` Tomasz Bursztyka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130617092611.2814.61698.stgit@localhost \
--to=giuseppelng@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).