From 7e7748d79f69f93e45020fc3a5958b7ecc76ada7 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Tue, 30 Aug 2016 14:20:35 +0200 Subject: src/main: refresh help message It seems there are two kind of options: * general commands (-d, -v, -h, -C) * client commands (which requires another conntrackd instance) Refresh the help message to better reflect this. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main.c b/src/main.c index d12fe18..2be9b2f 100644 --- a/src/main.c +++ b/src/main.c @@ -36,9 +36,12 @@ struct ct_general_state st; struct ct_state state; -static const char usage_daemon_commands[] = - "Daemon mode commands:\n" - " -d [options]\t\tRun in daemon mode\n"; +static const char usage_general_commands[] = + "General commands:\n" + " -d, run in daemon mode\n" + " -C [configfile], configuration file path\n" + " -v, display conntrackd version\n" + " -h, display this help information\n"; static const char usage_client_commands[] = "Client mode commands:\n" @@ -54,22 +57,15 @@ static const char usage_client_commands[] = " -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" - " -h, display this help information\n"; - -static const char usage_options[] = - "Options:\n" - " -C [configfile], configuration file path\n"; + " -t, reset the kernel timeout (see PurgeTimeout clause)\n"; static void show_usage(char *progname) { fprintf(stdout, "Connection tracking userspace daemon v%s\n", VERSION); fprintf(stdout, "Usage: %s [commands] [options]\n\n", progname); - fprintf(stdout, "%s\n", usage_daemon_commands); + fprintf(stdout, "%s\n", usage_general_commands); fprintf(stdout, "%s\n", usage_client_commands); - fprintf(stdout, "%s\n", usage_options); } static void -- cgit v1.2.3