[Listener] Fix/improve help message

This commit is contained in:
Matteo Cypriani 2013-06-23 17:50:24 -04:00 committed by Matteo Cypriani
parent 779c859add
commit b5915aee8d
1 changed files with 20 additions and 21 deletions

View File

@ -365,7 +365,7 @@ int parse_config_file(int argc, char **argv)
CFG_STR("aggregation_ip", "127.0.0.1", CFGF_NONE),
// Port on which the aggregator listens:
CFG_INT("aggregation_port", OWL_DEFAULT_LISTENER_PORT, CFGF_NONE),
// Port on which mobiles send active requests:
// Port to which mobiles send active requests:
CFG_INT("listening_port", OWL_DEFAULT_REQUEST_PORT, CFGF_NONE),
#ifdef OWLPS_LISTENER_KEEPS_MONITOR
// Activate the active monitor mode keeping-up (read the code if
@ -385,13 +385,13 @@ int parse_config_file(int argc, char **argv)
// Destination IP address of the autocalibration requests (default:
// none, but will be set to aggregation_ip in the config check):
CFG_STR("autocalibration_ip", "", CFGF_NONE),
// Port on which autocalibration requests are sent (default: 0,
// Port to which autocalibration requests are sent (default: 0,
// but will be set to listening_port in the config check):
CFG_INT("autocalibration_request_port", 0, CFGF_NONE),
// Port on which autocalibration orders are received:
CFG_INT("autocalibration_order_port",
OWL_DEFAULT_AUTOCALIBRATION_ORDER_PORT, CFGF_NONE),
// Port on which autocalibration hello are sent:
// Port to which autocalibration hello are sent:
CFG_INT("autocalibration_hello_port",
OWL_DEFAULT_AUTOCALIBRATION_HELLO_PORT, CFGF_NONE),
// Delay between two hello messages:
@ -1734,21 +1734,21 @@ void print_usage()
" [-D]"
" [-v[v[v[v]]] | -q]"
"\n\t"
" <-r rtap_iface | -R pcap_file>"
" [-w wifi_iface]"
" <-r rtap_iface [-w wifi_iface] | -R pcap_file>"
" [-K]"
" [-m mode]"
"\n\t"
" [-i aggregation_ip]"
" [-l listening_port]"
" [-i aggregation_ip]"
" [-p aggregation_port]"
"\n\t"
" [-A]"
" [-I autocalibration_ip]"
" [-P autocalibration_request_port]"
"\n\t"
" [-a autocalibration_port]"
" [-H autocalibration_hello_delay]"
" [-O autocalibration_order_port]"
" [-H hello_port]"
" [-T hello_delay]"
"\n\t"
" [-t autocalibration_delay]"
" [-n autocalibration_nb_packets]"
@ -1776,38 +1776,37 @@ void print_usage()
"Capture options:\n"
"\t-m mode\t\t\tCapture mode: a(ctive), p(assive), m(ixed)"
"\n\t\t\t\t(default: a).\n"
"\t-l listening_port\tPort on which explicit positioning"
" requests are\n\t\t\t\tsent by mobiles (default: %d).\n"
"\t-l listening_port\tPort to which explicit positioning"
" requests are\n\t\t\t\tsent by the mobiles (default: %d).\n"
"\t-i aggregation_ip\tIP address of the aggregation server"
" (default:\n\t\t\t\t127.0.0.1)\n"
" (default:\n\t\t\t\t127.0.0.1).\n"
"\t-p aggregation_port\tRequests are transmitted to the"
" aggregation\n\t\t\t\tserver on this port (default: %d).\n"
"\t-r rtap_iface\t\tRadiotap capture interface.\n"
"\t-R pcap_file\t\tPcap file to read packets from.\n"
"\t-r rtap_iface\t\tRadiotap-enabled capture interface.\n"
"\t-w wifi_iface\t\tPhysical interface behind rtap_iface"
" (default:\n\t\t\t\trtap_iface).\n"
"\t-R pcap_file\t\tPcap file to read packets from.\n"
"Autocalibration options:\n"
"(These options are available only if the program was compiled"
" with support of\nthe POSIX threads and the adequate"
" compilation-time option.)\n"
"\t-A\t\t\tEnable autocalibration (default: disabled).\n"
"\t-I autocalib_ip\t\tDestination IP of the autocalibration"
"\t-I ac_ip\t\tDestination IP of the autocalibration"
" requests\n\t\t\t\t(default: aggregation_ip).\n"
"\t-P autocalib_req_port\tPort on which autocalibration"
"\t-P ac_request_port\tPort to which autocalibration"
" requests are sent\n\t\t\t\t(default: listening_port).\n"
"\t-O order_port\t\tPort on which autocalibration orders are"
"\t-O ac_order_port\tPort on which autocalibration orders are"
"\n\t\t\t\treceived from the aggregation server (default:"
"\n\t\t\t\t%d).\n"
"\t-H hello_port\t\tPort on which hello messages are sent to"
"\t-H hello_port\t\tPort to which hello messages are sent to"
" the\n\t\t\t\taggregation server (default: %d).\n"
"\t-T hello_delay\t\tTime between each hello message sent to"
" the\n\t\t\t\taggregation server, in seconds (default:"
" %d s).\n"
"\t-t delay\t\tTime between each autocalibration"
" packet\n\t\t\t\ttransmission, in milliseconds (default:"
" %d ms).\n"
"\t-n nb_packets\t\tNumber of packet transmitted"
"\t-t ac_delay\t\tTime between two autocalibration"
" packets,\n\t\t\t\tin milliseconds (default: %d ms).\n"
"\t-n ac_nb_packets\tNumber of packets transmitted"
" for one\n\t\t\t\tautocalibration request (default: %d).\n"
"\tdirection x y z\t\tThe coordinates of the listener"
" (direction is an\n\t\t\t\tinteger; x, y, z are floats).\n"