[conntrack-tools] conntrackd: display help information with `-h'

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=2304918b8e82e57be87882c97dfc32c4848d68af
commit 2304918b8e82e57be87882c97dfc32c4848d68af
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Feb 15 15:56:15 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Feb 15 15:56:15 2009 +0100

    conntrackd: display help information with `-h'
    
    This patch also adds missing `-v' information to the manpage.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  2304918b8e82e57be87882c97dfc32c4848d68af (commit)
      from  c4ef74420bc09b82146190870186fb067ac163e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2304918b8e82e57be87882c97dfc32c4848d68af
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Feb 15 15:56:15 2009 +0100

    conntrackd: display help information with `-h'
    
    This patch also adds missing `-v' information to the manpage.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 conntrackd.8 |    6 ++++++
 src/main.c   |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)
This patch also adds missing `-v' information to the manpage.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/conntrackd.8 b/conntrackd.8
index 2002738..cd7d084 100644
--- a/conntrackd.8
+++ b/conntrackd.8
@@ -55,6 +55,12 @@ Force a resync against the kernel connection tracking table
 .TP
 .BI "-t "
 Reset the in-kernel timers (See PurgeTimeout clause)
+.TP
+.BI "-v "
+Display version information.
+.TP
+.BI "-h "
+Display help information.
 .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 82f0d27..239e0da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,7 +48,8 @@ static const char usage_client_commands[] =
 	"  -n, request resync with other node (only FT-FW and NOTRACK modes)\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";
+	"  -v, display conntrackd version\n"
+	"  -h, display this help information\n";
 
 static const char usage_options[] =
 	"Options:\n"
@@ -240,6 +241,9 @@ int main(int argc, char *argv[])
 		case 'v':
 			show_version();
 			exit(EXIT_SUCCESS);
+		case 'h':
+			show_usage(argv[0]);
+			exit(EXIT_SUCCESS);
 		default:
 			show_usage(argv[0]);
 			fprintf(stderr, "Unknown option: %s\n", argv[i]);