diff --git a/owlps-aggregator/Makefile b/owlps-aggregator/Makefile index 8915044..f5bf98a 100644 --- a/owlps-aggregator/Makefile +++ b/owlps-aggregator/Makefile @@ -25,7 +25,7 @@ CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR) DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG=-fPIC -OWLPSFLAGS = -D USE_TIMESTAMP +#OWLPSFLAGS = LIBS = -pthread -lconfuse -L$(LIBOWLPS_DIR) -lowlps LDFLAGS = $(LIBS) $(OWLPSFLAGS) diff --git a/owlps-aggregator/owlps-aggregator.h b/owlps-aggregator/owlps-aggregator.h index 2bf6bcc..b4bba4b 100644 --- a/owlps-aggregator/owlps-aggregator.h +++ b/owlps-aggregator/owlps-aggregator.h @@ -9,9 +9,6 @@ #define DEBUG -// Uncomment to output the timestamp on each line of the output file: -//#define USE_TIMESTAMP - /* Arguments & program configuration */ #define OPTIONS "Aa:c:C:f:hi:k:K:l:o:p:t:v" // getopt string diff --git a/owlps-aggregator/owlps-aggregatord.c b/owlps-aggregator/owlps-aggregatord.c index fcbe025..7e699f4 100644 --- a/owlps-aggregator/owlps-aggregatord.c +++ b/owlps-aggregator/owlps-aggregatord.c @@ -477,9 +477,7 @@ void* monitor_requests(void *NULL_value) FILE *fd = NULL ; char mac_str[OWL_ETHER_ADDR_STRLEN] ; uint_fast32_t sub ; // owl_time_elapsed_ms() result -#ifdef USE_TIMESTAMP char request_time_str[OWL_TIMESTAMP_STR_LEN] ; -#endif // USE_TIMESTAMP uint_fast32_t aggregate_timeout = cfg_getint(cfg, "aggregate_timeout") ; @@ -553,12 +551,10 @@ void* monitor_requests(void *NULL_value) // Print request type to the output file fprintf(fd, "%"PRIu8";", request_ptr->type) ; -#ifdef USE_TIMESTAMP // Print request mobile timestamp to the output file owl_timestamp_to_string(request_time_str, request_ptr->request_time) ; fprintf(fd, "%s;", request_time_str) ; -#endif // USE_TIMESTAMP // Print request info to the output file fprintf(fd, "%0.2f;%0.2f;%0.2f;%hhd",