diff options
Diffstat (limited to 'src/tools/oping')
| -rw-r--r-- | src/tools/oping/oping.c | 10 | ||||
| -rw-r--r-- | src/tools/oping/oping_client.c | 10 | ||||
| -rw-r--r-- | src/tools/oping/oping_server.c | 4 | 
3 files changed, 12 insertions, 12 deletions
diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c index 0ca40326..b476b33a 100644 --- a/src/tools/oping/oping.c +++ b/src/tools/oping/oping.c @@ -48,10 +48,10 @@ struct c {          /* stats */          int    sent;          int    rcvd; -        float  rtt_min; -        float  rtt_max; -        float  rtt_avg; -        float  rtt_m2; +        double rtt_min; +        double rtt_max; +        double rtt_avg; +        double rtt_m2;          flow_set_t * flows; @@ -82,7 +82,7 @@ struct oping_msg {  #include "oping_client.c"  #include "oping_server.c" -static void usage() +static void usage(void)  {          printf("Usage: oping [OPTION]...\n"                 "Checks liveness between a client and a server\n" diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c index c2471b46..9f49a1df 100644 --- a/src/tools/oping/oping_client.c +++ b/src/tools/oping/oping_client.c @@ -62,8 +62,8 @@ void * reader(void * o)          struct oping_msg * msg = (struct oping_msg *) buf;          int fd = 0;          int msg_len = 0; -        float ms = 0; -        float d = 0; +        double ms = 0; +        double d = 0;          fqueue_t * fq = fqueue_create();          if (fq == NULL)                  return (void *) 1; @@ -83,7 +83,7 @@ void * reader(void * o)                                  continue;                          } -                        if ((int) ntohl(msg->id) >= client.count) { +                        if (ntohl(msg->id) >= (ssize_t) client.count) {                                  printf("Invalid id.\n");                                  continue;                          } @@ -94,7 +94,7 @@ void * reader(void * o)                          pthread_mutex_lock(&client.lock);                          ms = ts_diff_us(&client.times[ntohl(msg->id)], &now) -                                /1000.0; +                                / 1000.0;                          pthread_mutex_unlock(&client.lock);                          printf("%d bytes from %s: seq=%d time=%.3f ms\n", @@ -164,7 +164,7 @@ void * writer(void * o)          return (void *) 0;  } -int client_main() +int client_main(void)  {          struct sigaction sig_act; diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c index 8680b11b..193b76d1 100644 --- a/src/tools/oping/oping_server.c +++ b/src/tools/oping/oping_server.c @@ -107,7 +107,7 @@ void * server_thread(void *o)                          server.times[fd] = now;                          pthread_mutex_unlock(&server.lock); -                        msg->type = htonl((uint32_t) ECHO_REPLY); +                        msg->type = htonl(ECHO_REPLY);                          if (flow_write(fd, buf, msg_len) < 0) {                                  printf("Error writing to flow (fd %d).\n", fd); @@ -156,7 +156,7 @@ void * accept_thread(void * o)          return (void *) 0;  } -int server_main() +int server_main(void)  {          struct sigaction sig_act;  | 
