[Aggregator] Reorganise usage message, document -o

This commit is contained in:
Matteo Cypriani 2011-03-08 11:04:52 +01:00
parent 0676462082
commit f33ab91187
1 changed files with 10 additions and 7 deletions

View File

@ -1105,13 +1105,13 @@ void print_usage()
"\t%s" "\t%s"
" [-f config_file]" " [-f config_file]"
" [-v]" " [-v]"
" [-l listening_port]" " [-o output_file]"
" [-i positionner_ip]" " [-i positionner_ip]"
" [-p positioner_port]" " [-p positioner_port]"
" [-l listening_port]"
" [-t aggregate_timeout]" " [-t aggregate_timeout]"
" [-k keep_timeout]" " [-k keep_timeout]"
" [-c check_interval]" " [-c check_interval]"
" [-o output_file]"
" [-A]" " [-A]"
" [-a autocalibration_port]" " [-a autocalibration_port]"
" [-K ap_keep_timeout]" " [-K ap_keep_timeout]"
@ -1121,19 +1121,21 @@ void print_usage()
"Main options:\n" "Main options:\n"
"\t-h\t\tPrint this help.\n" "\t-h\t\tPrint this help.\n"
"\t-f config_file\tUse 'config_file' instead of the default" "\t-f config_file\tUse 'config_file' instead of the default"
" configuration file.\n" " configuration file (%s).\n"
"\t-v\t\tBe verbose (print detailed info on each received" "\t-v\t\tBe verbose (print detailed info on each received"
" message).\n" " message).\n"
"Server options:\n" "Output options:\n"
"\t-l listening_port\tOnly requests sent on this port will be" "\t-o output_file\t\tAggregated requests will be appended to"
" treated (default: %d).\n" " this file.\n"
"\t-i positionner_ip\tIP address of the localisation server" "\t-i positionner_ip\tIP address of the localisation server"
" (default: %s).\n" " (default: %s).\n"
"\t-p positioner_port\tAggregated requests are transmitted to" "\t-p positioner_port\tAggregated requests are transmitted to"
" the localisation server on this port (default: %d).\n" " the localisation server on this port (default: %d).\n"
"Aggregation options:\n" "Aggregation options:\n"
"\t-l listening_port\tOnly requests sent on this port will be"
" treated (default: %d).\n"
"\t-t aggregate_timeout\tRequests are stored during" "\t-t aggregate_timeout\tRequests are stored during"
" 'aggregate_timeout' milliseconds before to be grouped" " 'aggregate_timeout' milliseconds before to be grouped"
" (default: %d ms).\n" " (default: %d ms).\n"
@ -1152,9 +1154,10 @@ void print_usage()
" checks of the stored APs (default: %d ms).\n" " checks of the stored APs (default: %d ms).\n"
, ,
program_name, program_name,
AGGREGATE_DEFAULT_PORT, DEFAULT_CONFIG_FILE,
POSITIONER_DEFAULT_IP, POSITIONER_DEFAULT_IP,
POSITIONER_DEFAULT_PORT, POSITIONER_DEFAULT_PORT,
AGGREGATE_DEFAULT_PORT,
DEFAULT_AGGREGATE_TIMEOUT, DEFAULT_AGGREGATE_TIMEOUT,
DEFAULT_KEEP_TIMEOUT, DEFAULT_KEEP_TIMEOUT,
DEFAULT_CHECK_INTERVAL, DEFAULT_CHECK_INTERVAL,