* [PATCH nf-next] netfilter: conntrack: proc: rename stat column
@ 2020-09-09 11:29 Florian Westphal
2020-09-21 23:33 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2020-09-09 11:29 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
Rename 'searched' column to 'clashres' (same len).
conntrack(8) using the old /proc interface (ctnetlink not available) shows:
cpu=0 entries=4784 clashres=2292 [..]
Another alternative is to add another column, but this increases the
number of always-0 columns.
Fixes: bc92470413f3af1 ("netfilter: conntrack: add clash resolution stat counter")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/netfilter/nf_conntrack_standalone.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 0ff39740797d..46c5557c1fec 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -428,14 +428,14 @@ static int ct_cpu_seq_show(struct seq_file *seq, void *v)
const struct ip_conntrack_stat *st = v;
if (v == SEQ_START_TOKEN) {
- seq_puts(seq, "entries searched found new invalid ignore delete delete_list insert insert_failed drop early_drop icmp_error expect_new expect_create expect_delete search_restart\n");
+ seq_puts(seq, "entries clashres found new invalid ignore delete delete_list insert insert_failed drop early_drop icmp_error expect_new expect_create expect_delete search_restart\n");
return 0;
}
seq_printf(seq, "%08x %08x %08x %08x %08x %08x %08x %08x "
"%08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
nr_conntracks,
- st->clash_resolve, /* was: searched */
+ st->clash_resolve,
st->found,
0,
st->invalid,
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf-next] netfilter: conntrack: proc: rename stat column
2020-09-09 11:29 [PATCH nf-next] netfilter: conntrack: proc: rename stat column Florian Westphal
@ 2020-09-21 23:33 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2020-09-21 23:33 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Wed, Sep 09, 2020 at 01:29:01PM +0200, Florian Westphal wrote:
> Rename 'searched' column to 'clashres' (same len).
>
> conntrack(8) using the old /proc interface (ctnetlink not available) shows:
>
> cpu=0 entries=4784 clashres=2292 [..]
>
> Another alternative is to add another column, but this increases the
> number of always-0 columns.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-21 23:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-09 11:29 [PATCH nf-next] netfilter: conntrack: proc: rename stat column Florian Westphal
2020-09-21 23:33 ` 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).