From 36da3b40b821452d2d4607928ce54ced707541df Mon Sep 17 00:00:00 2001 From: Adrian Bridgett Date: Tue, 20 Mar 2012 13:02:54 +0100 Subject: src: manpage and help display improvements This patch adds missing information regarding several conntrackd options to the manpage and the help info that is displayed in the command line. Signed-off-by: Pablo Neira Ayuso --- conntrack.8 | 6 +++--- conntrackd.8 | 10 ++++++++++ src/main.c | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/conntrack.8 b/conntrack.8 index 6525123..a411fd4 100644 --- a/conntrack.8 +++ b/conntrack.8 @@ -6,17 +6,17 @@ .SH NAME conntrack \- command line interface for netfilter connection tracking .SH SYNOPSIS -.BR "conntrack -L [table] [-z]" +.BR "conntrack -L [table] [options] [-z]" .br .BR "conntrack -G [table] parameters" .br -.BR "conntrack -D [table] paramaters" +.BR "conntrack -D [table] parameters" .br .BR "conntrack -I [table] parameters" .br .BR "conntrack -U [table] parameters" .br -.BR "conntrack -E [table] parameters" +.BR "conntrack -E [table] [options]" .br .BR "conntrack -F [table]" .br diff --git a/conntrackd.8 b/conntrackd.8 index f07ad7a..131a7ac 100644 --- a/conntrackd.8 +++ b/conntrackd.8 @@ -41,10 +41,16 @@ Flush the internal and/or external cache Flush the kernel conntrack table (if you use a Linux kernel >= 2.6.29, this option will not flush your internal and external cache). .TP +.BI "-c " +Commit external cache to conntrack table. +.TP .BI "-B " Force a bulk send to other replica firewalls. With this command, you will ask conntrackd to send the state-entries that it owns to others. .TP +.BI "-n " +Request resync with other node (only FT-FW and NOTRACK modes). +.TP .BI "-k " Kill the daemon .TP @@ -69,6 +75,10 @@ Display version information. .TP .BI "-h " Display help information. +.TP +.BI "-C config file" +Configuration file path. +.TP .SH DIAGNOSTICS The exit code is 0 for correct function. Errors cause an exit code of 1. .SH EXAMPLES diff --git a/src/main.c b/src/main.c index 0850a29..f7803fd 100644 --- a/src/main.c +++ b/src/main.c @@ -49,6 +49,7 @@ static const char usage_client_commands[] = "dump statistics\n" " -R [ct|expect], resync with kernel conntrack table\n" " -n, request resync with other node (only FT-FW and NOTRACK modes)\n" + " -B, force a bulk send to other replica firewalls\n" " -x, dump cache in XML format (requires -i or -e)\n" " -t, reset the kernel timeout (see PurgeTimeout clause)\n" " -v, display conntrackd version\n" -- cgit v1.2.3