octo@huhu:~/liboping $ svn merge -r2:3 trunk branches/liboping-0.1

diff --git a/src/liboping.c b/src/liboping.c
index b926090..778ef07 100644 (file)
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -35,10 +35,6 @@
 # include <unistd.h>
 #endif
 
-#ifndef __USE_BSD
-# define __USE_BSD
-#endif
-
 #if HAVE_FCNTL_H
 # include <fcntl.h>
 #endif

diff --git a/src/oping.c b/src/oping.c
index 5f0940d..cc115f2 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -67,7 +67,6 @@ typedef struct ping_context
        double latency_min;
        double latency_max;
        double latency_total;
-       double latency_total_square;
 } ping_context_t;
 
 static double opt_interval   = 1.0;
@@ -92,7 +91,6 @@ ping_context_t *context_create (void)
        ret->latency_min   = -1.0;
        ret->latency_max   = -1.0;
        ret->latency_total = 0.0;
-       ret->latency_total_square = 0.0;
 
        return (ret);
 }
@@ -175,14 +173,13 @@ void print_host (pingobj_iter_t *iter)
        {
                context->req_rcvd++;
                context->latency_total += latency;
-               context->latency_total_square += (latency * latency);
 
                if ((context->latency_max < 0.0) || (context->latency_max < latency))
                        context->latency_max = latency;
                if ((context->latency_min < 0.0) || (context->latency_min > latency))
                        context->latency_min = latency;
 
-               printf ("echo reply from %s (%s): icmp_seq=%u time=%.2f ms\n",
+               printf ("echo reply from %s (%s): icmp_seq=%u time=%.1f ms\n",
                                context->host, context->addr,
                                (unsigned int) sequence, latency);
        }
@@ -386,28 +383,15 @@ int main (int argc, char **argv)
                context = ping_iterator_get_context (iter);
 
                printf ("\n--- %s ping statistics ---\n"
-                               "%i packets transmitted, %i received, %.2f%% packet loss, time %.1fms\n",
+                               "%i packets transmitted, %i received, %.2f%% packet loss, time %.1fms\n"
+                               "rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n",
                                context->host, context->req_sent, context->req_rcvd,
                                100.0 * (context->req_sent - context->req_rcvd) / ((double) context->req_sent),
-                               context->latency_total);
-
-               if (context->req_rcvd != 0)
-               {
-                       double num_total;
-                       double average;
-                       double deviation;
-
-                       num_total = (double) context->req_rcvd;
-
-                       average = context->latency_total / num_total;
-                       deviation = sqrt ((context->latency_total_square / num_total) - (average * average));
-
-                       printf ("rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n",
-                                       context->latency_min,
-                                       average,
-                                       context->latency_max,
-                                       deviation);
-               }
+                               context->latency_total,
+                               context->latency_min,
+                               context->latency_total / ((double) context->req_rcvd),
+                               context->latency_max,
+                               0.00);
 
                ping_iterator_set_context (iter, NULL);
                free (context);