From 70744136608e3ee38f15c994fc2633cf5e3c9fa2 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 31 Mar 2009 15:31:59 +0200 Subject: conntrack: fix missing bits in `-C' command This patch fixes some missing bits for the `-C' conntrack command like the manpage information, the usage help, the `--counters' synonymous and the commands vs. options checking. Signed-off-by: Pablo Neira Ayuso --- conntrack.8 | 2 ++ src/conntrack.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/conntrack.8 b/conntrack.8 index 94f4e41..280af9c 100644 --- a/conntrack.8 +++ b/conntrack.8 @@ -19,6 +19,8 @@ conntrack \- command line interface for netfilter connection tracking .BR "conntrack -E [table] parameters" .br .BR "conntrack -F [table]" +.br +.BR "conntrack -C [table]" .SH DESCRIPTION .B conntrack provides a full featured userspace interface to the netfilter connection tracking system that is intended to replace the old /proc/net/ip_conntrack interface. This tool can be used to search, list, inspect and maintain the connection tracking subsystem of the Linux kernel. diff --git a/src/conntrack.c b/src/conntrack.c index c746ae8..2764d80 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -77,6 +77,7 @@ static struct option original_opts[] = { {"get", 1, 0, 'G'}, {"flush", 1, 0, 'F'}, {"event", 1, 0, 'E'}, + {"counter", 2, 0, 'C'}, {"version", 0, 0, 'V'}, {"help", 0, 0, 'h'}, {"orig-src", 1, 0, 's'}, @@ -141,6 +142,7 @@ static char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] = /*EXP_FLUSH*/ {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, /*EXP_EVENT*/ {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, /*CT_COUNT*/ {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, +/*EXP_COUNT*/ {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, }; static LIST_HEAD(proto_list); @@ -553,7 +555,8 @@ static const char usage_commands[] = " -I [table] parameters\t\tCreate a conntrack or expectation\n" " -U [table] parameters\t\tUpdate a conntrack\n" " -E [table] [options]\t\tShow events\n" - " -F [table]\t\t\tFlush table\n"; + " -F [table]\t\t\tFlush table\n" + " -C [table]\t\t\tShow counter\n"; static const char usage_tables[] = "Tables: conntrack, expect\n"; -- cgit v1.2.3