Commit 1702ad79 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: proc: rename stat column 



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: bc924704 ("netfilter: conntrack: add clash resolution stat counter")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c5a2a132

net/netfilter/nf_conntrack_standalone.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -428,14 +428,14 @@ static int ct_cpu_seq_show(struct seq_file *seq, void *v) 
	const struct ip_conntrack_stat *st = v;

	const struct ip_conntrack_stat *st = v;





	if (v == SEQ_START_TOKEN) {

	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;

		return 0;

	}

	}





	seq_printf(seq, "%08x  %08x %08x %08x %08x %08x %08x %08x "

	seq_printf(seq, "%08x  %08x %08x %08x %08x %08x %08x %08x "

			"%08x %08x %08x %08x %08x  %08x %08x %08x %08x\n",

			"%08x %08x %08x %08x %08x  %08x %08x %08x %08x\n",

		   nr_conntracks,

		   nr_conntracks,

		   st->clash_resolve, /* was: searched */

		   st->clash_resolve,

		   st->found,

		   st->found,

		   0,

		   0,

		   st->invalid,

		   st->invalid,