* [ebtables-compat PATCH] ebtables-compat: fix counter listing
@ 2014-12-23 12:24 Arturo Borrero Gonzalez
2014-12-23 13:28 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Arturo Borrero Gonzalez @ 2014-12-23 12:24 UTC (permalink / raw)
To: netfilter-devel; +Cc: giuseppelng, pablo
With this patch:
% sudo ebtables-compat -L --Lc
Bridge table: filter
Bridge chain: INPUT, entries: 0, policy: ACCEPT
-j ACCEPT , pcnt = 123 -- bcnt = 123
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
iptables/nft-bridge.c | 5 +++++
iptables/xtables-eb.c | 12 +++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index a1bd906..98f8a4e 100644
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include <netinet/ether.h>
+#include <inttypes.h>
#include <xtables.h>
#include <libiptc/libxtc.h>
@@ -464,6 +465,10 @@ static void nft_bridge_print_firewall(struct nft_rule *r, unsigned int num,
}
}
+ if (!(format & FMT_NOCOUNTS))
+ printf(" , pcnt = %"PRIu64" -- bcnt = %"PRIu64"",
+ (uint64_t)cs.counters.pcnt, (uint64_t)cs.counters.bcnt);
+
if (!(format & FMT_NONEWLINE))
fputc('\n', stdout);
}
diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index b924daf..9d13868 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -443,14 +443,12 @@ static void print_help(const struct xtables_target *t,
/* Execute command L */
static int list_rules(struct nft_handle *h, const char *chain, const char *table,
int rule_nr, int verbose, int numeric, int expanded,
- int linenumbers)
+ int linenumbers, int counters)
{
unsigned int format;
format = FMT_OPTIONS;
- if (!verbose)
- format |= FMT_NOCOUNTS;
- else
+ if (verbose)
format |= FMT_VIA;
if (numeric)
@@ -462,6 +460,9 @@ static int list_rules(struct nft_handle *h, const char *chain, const char *table
if (linenumbers)
format |= FMT_LINENUMBERS;
+ if (!counters)
+ format |= FMT_NOCOUNTS;
+
return nft_rule_list(h, chain, table, rule_nr, format);
}
@@ -1179,7 +1180,8 @@ check_extension: */
flags&OPT_VERBOSE,
flags&OPT_NUMERIC,
/*flags&OPT_EXPANDED*/0,
- flags&LIST_N);
+ flags&LIST_N,
+ flags & LIST_C);
if (!(flags & OPT_ZERO) && exec_style == EXEC_STYLE_PRG)
exit(0);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [ebtables-compat PATCH] ebtables-compat: fix counter listing
2014-12-23 12:24 [ebtables-compat PATCH] ebtables-compat: fix counter listing Arturo Borrero Gonzalez
@ 2014-12-23 13:28 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2014-12-23 13:28 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel, giuseppelng
On Tue, Dec 23, 2014 at 01:24:26PM +0100, Arturo Borrero Gonzalez wrote:
> With this patch:
>
> % sudo ebtables-compat -L --Lc
> Bridge table: filter
>
> Bridge chain: INPUT, entries: 0, policy: ACCEPT
> -j ACCEPT , pcnt = 123 -- bcnt = 123
Applied to the ebtables-compat-experimental branch, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-23 13:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-23 12:24 [ebtables-compat PATCH] ebtables-compat: fix counter listing Arturo Borrero Gonzalez
2014-12-23 13:28 ` Pablo Neira Ayuso
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).