[Listener] Do not print a warning if AC_port == 0
If the autocalibration request port was not specified, a warning was issued. This is now fixed by issuing a warning only if the port is too big, but not if it is zero.
This commit is contained in:
parent
c4e03520f3
commit
e239dffa4f
|
@ -92,28 +92,28 @@ struct {
|
||||||
#endif // USE_PTHREAD
|
#endif // USE_PTHREAD
|
||||||
uint_fast8_t verbose ;
|
uint_fast8_t verbose ;
|
||||||
} options = { // Initalise default options:
|
} options = { // Initalise default options:
|
||||||
owl_false,
|
owl_false, // daemon
|
||||||
MODE_ACTIVE,
|
MODE_ACTIVE, // mode
|
||||||
"127.0.0.1",
|
"127.0.0.1", // aggregation_ip
|
||||||
OWL_DEFAULT_LISTENER_PORT,
|
OWL_DEFAULT_LISTENER_PORT, // aggregation_port
|
||||||
OWL_DEFAULT_REQUEST_PORT,
|
OWL_DEFAULT_REQUEST_PORT, // listening_port
|
||||||
#ifdef ENABLE_KEEP_MONITOR
|
#ifdef ENABLE_KEEP_MONITOR
|
||||||
owl_false,
|
owl_false, // keep_monitor
|
||||||
#endif // ENABLE_KEEP_MONITOR
|
#endif // ENABLE_KEEP_MONITOR
|
||||||
"",
|
"", // rtap_iface
|
||||||
"",
|
"", // wifi_iface
|
||||||
#ifdef USE_PTHREAD
|
#ifdef USE_PTHREAD
|
||||||
owl_false,
|
owl_false, // autocalibration
|
||||||
"",
|
"", // autocalibration_ip
|
||||||
0,
|
0, // autocalibration_request_port
|
||||||
OWL_DEFAULT_AUTOCALIBRATION_ORDER_PORT,
|
OWL_DEFAULT_AUTOCALIBRATION_ORDER_PORT, // autocalibration_order_port
|
||||||
OWL_DEFAULT_AUTOCALIBRATION_HELLO_PORT,
|
OWL_DEFAULT_AUTOCALIBRATION_HELLO_PORT, // autocalibration_hello_port
|
||||||
DEFAULT_AUTOCALIBRATION_HELLO_DELAY,
|
DEFAULT_AUTOCALIBRATION_HELLO_DELAY, // autocalibration_hello_delay
|
||||||
DEFAULT_AUTOCALIBRATION_DELAY,
|
DEFAULT_AUTOCALIBRATION_DELAY, // autocalibration_delay
|
||||||
DEFAULT_AUTOCALIBRATION_NBPKT,
|
DEFAULT_AUTOCALIBRATION_NBPKT, // autocalibration_nb_packets
|
||||||
0, 0, 0, 0,
|
0, 0, 0, 0, // Calibration data
|
||||||
#endif // USE_PTHREAD
|
#endif // USE_PTHREAD
|
||||||
0
|
0 // verbose
|
||||||
} ;
|
} ;
|
||||||
#endif // USE_CONFIG_FILE
|
#endif // USE_CONFIG_FILE
|
||||||
|
|
||||||
|
@ -660,14 +660,12 @@ int check_configuration()
|
||||||
" direction.\n", (int) GET_MY_DIRECTION()) ;
|
" direction.\n", (int) GET_MY_DIRECTION()) ;
|
||||||
|
|
||||||
// Autocalibration port numbers
|
// Autocalibration port numbers
|
||||||
|
if (GET_AUTOCALIBRATION_REQUEST_PORT() > 65535 && VERBOSE_WARNING)
|
||||||
|
fprintf(stderr, "Warning! Bad autocalibration_request_port:"
|
||||||
|
" failing back to the default value.\n") ;
|
||||||
if (GET_AUTOCALIBRATION_REQUEST_PORT() < 1 ||
|
if (GET_AUTOCALIBRATION_REQUEST_PORT() < 1 ||
|
||||||
GET_AUTOCALIBRATION_REQUEST_PORT() > 65535)
|
GET_AUTOCALIBRATION_REQUEST_PORT() > 65535)
|
||||||
{
|
SET_AUTOCALIBRATION_REQUEST_PORT(GET_LISTENING_PORT()) ;
|
||||||
if (VERBOSE_WARNING)
|
|
||||||
fprintf(stderr, "Warning! Bad autocalibration_request_port:"
|
|
||||||
" failing back to the default value.\n") ;
|
|
||||||
SET_AUTOCALIBRATION_REQUEST_PORT(GET_LISTENING_PORT()) ;
|
|
||||||
}
|
|
||||||
if (GET_AUTOCALIBRATION_ORDER_PORT() < 1 ||
|
if (GET_AUTOCALIBRATION_ORDER_PORT() < 1 ||
|
||||||
GET_AUTOCALIBRATION_ORDER_PORT() > 65535)
|
GET_AUTOCALIBRATION_ORDER_PORT() > 65535)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue