diff --git a/infrastructure-centred/owlps-listener/owlps-listenerd.c b/infrastructure-centred/owlps-listener/owlps-listenerd.c index 51d741f..e7d1378 100644 --- a/infrastructure-centred/owlps-listener/owlps-listenerd.c +++ b/infrastructure-centred/owlps-listener/owlps-listenerd.c @@ -372,23 +372,38 @@ void print_configuration() cfg_print(cfg, stderr) ; #else // USE_CONFIG_FILE fprintf(stderr, + "mode = %c\n" "aggregation_ip = \"%s\"\n" "aggregation_port = %ld\n" "listening_port = %ld\n" "rtap_iface = \"%s\"\n" "wifi_iface = \"%s\"\n" +#ifdef USE_PTHREAD + "keep_monitor = %s\n" + "autocalibration = %s\n" + "autocalibration_port = %ld\n" + "autocalibration_hello_delay = %ld\n" + "autocalibration_delay = %ld\n" + "autocalibration_nb_packets = %d\n" +#endif // USE_PTHREAD + "verbose = %s\n" , + GET_MODE(), GET_AGGREGATION_IP(), GET_AGGREGATION_PORT(), GET_LISTENING_PORT(), GET_RTAP_IFACE(), - GET_WIFI_IFACE() - ); + GET_WIFI_IFACE(), #ifdef USE_PTHREAD - fprintf(stderr, "keep_monitor = %s\n", - GET_KEEP_MONITOR() ? "true" : "false" - ) ; + BOOL_TO_STRING(GET_KEEP_MONITOR()), + BOOL_TO_STRING(GET_AUTOCALIBRATION()), + GET_AUTOCALIBRATION_PORT(), + GET_AUTOCALIBRATION_HELLO_DELAY(), + GET_AUTOCALIBRATION_DELAY(), + GET_AUTOCALIBRATION_NBPKT(), #endif // USE_PTHREAD + BOOL_TO_STRING(GET_VERBOSE()) + ) ; #endif // USE_CONFIG_FILE } #endif // DEBUG diff --git a/libowlps/owlps.h b/libowlps/owlps.h index 8c65de9..30ec9a7 100644 --- a/libowlps/owlps.h +++ b/libowlps/owlps.h @@ -51,6 +51,7 @@ /* Type booléen */ typedef enum {FALSE, TRUE} BOOL ; +#define BOOL_TO_STRING(B) ((B) ? "true" : "false") /* Type direction */