mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Aggregator] Fix request display

This commit is contained in:
Matteo Cypriani 2011-10-13 15:43:41 +02:00
parent 603293c5f9
commit c158d87b5a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
owlps-aggregator/owlps-aggregatord.c
View File

@ -451,11 +451,6 @@ int read_loop(int sockfd)
struct sockaddr_in client; // UDP client structure
socklen_t client_len = sizeof(client) ; // Size of clients
owl_captured_request request ; // Message read on the socket
char // Return values of
mobile_ip_str[INET_ADDRSTRLEN], // inet_ntop()
// and owl_timestamp_to_string():
request_time_str[OWL_TIMESTAMP_STRLEN],
start_time_str[OWL_TIMESTAMP_STRLEN] ;
while (owl_run)
{
@ -481,11 +476,24 @@ int read_loop(int sockfd)
if (VERBOSE_REQUESTS)
{
char // Return values of
mobile_ip_str[INET_ADDRSTRLEN], // inet_ntop()
// and owl_timestamp_to_string():
request_time_str[OWL_TIMESTAMP_STRLEN],
start_time_str[OWL_TIMESTAMP_STRLEN],
ap_mac_addr_str[OWL_ETHER_ADDR_STRLEN],
mobile_mac_addr_str[OWL_ETHER_ADDR_STRLEN] ;
inet_ntop(AF_INET, &request.mobile_ip_addr_bytes,
mobile_ip_str, INET_ADDRSTRLEN) ;
owl_timestamp_to_string(request_time_str,
request.request_time) ;
owl_timestamp_to_string(start_time_str, request.start_time) ;
owl_mac_bytes_to_string_r(request.ap_mac_addr_bytes,
ap_mac_addr_str) ;
owl_mac_bytes_to_string_r(request.mobile_mac_addr_bytes,
mobile_mac_addr_str) ;
fprintf(stderr,
"\n"
"*** Request received from AP ***\n"
@ -502,8 +510,8 @@ int read_loop(int sockfd)
"\tDirection: %"PRIu8"\n"
,
request.type,
owl_mac_bytes_to_string(request.ap_mac_addr_bytes),
owl_mac_bytes_to_string(request.mobile_mac_addr_bytes),
ap_mac_addr_str,
mobile_mac_addr_str,
mobile_ip_str,
request_time_str,
start_time_str,