diff --git a/src/oping.c b/src/oping.c
index 79afb5f55a47f8a32f3d0c0f50e9d9eee59f3121..bac45f05ad784fe67057e4aac4a2462d9def900b 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2014 Florian octo Forster <ff at octo.it>
+ * Copyright (C) 2006-2016 Florian octo Forster <ff at octo.it>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
# define _X_OPEN_SOURCE_EXTENDED
/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
# define _X_OPEN_SOURCE_EXTENDED
-# if HAVE_NCURSESW_NCURSES_H
-# include <ncursesw/ncurses.h>
-# elif HAVE_NCURSES_H
+#if defined HAVE_NCURSESW_CURSES_H
+# include <ncursesw/curses.h>
+#elif defined HAVE_NCURSESW_H
+# include <ncursesw.h>
+#elif defined HAVE_NCURSES_CURSES_H
+# include <ncurses/curses.h>
+#elif defined HAVE_NCURSES_H
# include <ncurses.h>
# include <ncurses.h>
-# endif
+#else
+# error "SysV or X/Open-compatible Curses header file required"
+#endif
# define OPING_GREEN 1
# define OPING_YELLOW 2
# define OPING_GREEN 1
# define OPING_YELLOW 2
#endif
/* The last n RTTs in the order they were sent. */
double history_by_time[HISTORY_SIZE_MAX];
#endif
/* The last n RTTs in the order they were sent. */
double history_by_time[HISTORY_SIZE_MAX];
- /* Current size of the history. This is a value between 0 and
- * HISTORY_SIZE_MAX. */
+
+ /* Current number of entries in the history. This is a value between 0
+ * and HISTORY_SIZE_MAX. */
size_t history_size;
size_t history_size;
+
+ /* Number "received" entries in the history, i.e. non-NAN entries. */
+ size_t history_received;
+
/* Index of the next RTT to be written to history_by_time. This wraps
* around to 0 once the histroty has grown to HISTORY_SIZE_MAX. */
size_t history_index;
/* Index of the next RTT to be written to history_by_time. This wraps
* around to 0 once the histroty has grown to HISTORY_SIZE_MAX. */
size_t history_index;
- /* Number received replies, i.e. non-NAN entries. */
- size_t history_received;
- /* The last n RTTs sorted by value. timed out packets are sorted to the
- * back. */
+
+ /* The last history_size RTTs sorted by value. timed out packets (NAN
+ * entries) are sorted to the back. */
double history_by_value[HISTORY_SIZE_MAX];
double history_by_value[HISTORY_SIZE_MAX];
+
/* If set to true, history_by_value has to be re-calculated. */
_Bool history_dirty;
/* If set to true, history_by_value has to be re-calculated. */
_Bool history_dirty;
} ping_context_t;
static double opt_interval = 1.0;
} ping_context_t;
static double opt_interval = 1.0;
+static double opt_timeout = PING_DEF_TIMEOUT;
static int opt_addrfamily = PING_DEF_AF;
static char *opt_srcaddr = NULL;
static char *opt_device = NULL;
static int opt_addrfamily = PING_DEF_AF;
static char *opt_srcaddr = NULL;
static char *opt_device = NULL;
+static char *opt_mark = NULL;
static char *opt_filename = NULL;
static int opt_count = -1;
static int opt_send_ttl = 64;
static char *opt_filename = NULL;
static int opt_count = -1;
static int opt_send_ttl = 64;
static int opt_show_graph = 1;
static int opt_utf8 = 0;
#endif
static int opt_show_graph = 1;
static int opt_utf8 = 0;
#endif
+static char *opt_outfile = NULL;
+static int opt_bell = 0;
-static int host_num = 0;
+static int host_num = 0;
+static FILE *outfile = NULL;
#if USE_NCURSES
static WINDOW *main_win = NULL;
#if USE_NCURSES
static WINDOW *main_win = NULL;
/* Copy all values from by_time to by_value. */
memcpy (ctx->history_by_value, ctx->history_by_time,
sizeof (ctx->history_by_time));
/* Copy all values from by_time to by_value. */
memcpy (ctx->history_by_value, ctx->history_by_time,
sizeof (ctx->history_by_time));
+
/* Sort all RTTs. */
qsort (ctx->history_by_value, ctx->history_size, sizeof
(ctx->history_by_value[0]), compare_double);
/* Sort all RTTs. */
qsort (ctx->history_by_value, ctx->history_size, sizeof
(ctx->history_by_value[0]), compare_double);
+ /* Update the number of received RTTs. */
ctx->history_received = 0;
for (i = 0; i < ctx->history_size; i++)
if (!isnan (ctx->history_by_value[i]))
ctx->history_received = 0;
for (i = 0; i < ctx->history_size; i++)
if (!isnan (ctx->history_by_value[i]))
clean_history (ctx);
clean_history (ctx);
+ /* Not a single packet was received successfully. */
if (ctx->history_received == 0)
return NAN;
if (ctx->history_received == 0)
return NAN;
} /* }}} double percentile_to_latency */
#if USE_NCURSES
} /* }}} double percentile_to_latency */
#if USE_NCURSES
-static double latency_to_percentile (ping_context_t *ctx, /* {{{ */
+static double latency_to_ratio (ping_context_t *ctx, /* {{{ */
double latency)
{
size_t low;
double latency)
{
size_t low;
clean_history (ctx);
clean_history (ctx);
+ /* Not a single packet was received successfully. */
if (ctx->history_received == 0)
return NAN;
if (ctx->history_received == 0)
return NAN;
else if (latency >= ctx->history_by_value[high])
return 100.0;
else if (latency >= ctx->history_by_value[high])
return 100.0;
+ /* Do a binary search for the latency. This will work even when the
+ * exact latency is not in the array. If the latency is in the array
+ * multiple times, "low" will be set to the index of the last
+ * occurrence. The value at index "high" will be larger than the
+ * searched for latency (assured by the above "if" block. */
while ((high - low) > 1)
{
index = (high + low) / 2;
while ((high - low) > 1)
{
index = (high + low) / 2;
else
index = high;
else
index = high;
- return (100.0 * ((double) (index + 1)) / ((double) ctx->history_received));
-} /* }}} double latency_to_percentile */
+ return (((double) (index + 1)) / ((double) ctx->history_received));
+} /* }}} double latency_to_ratio */
#endif
static double context_get_packet_loss (const ping_context_t *ctx) /* {{{ */
#endif
static double context_get_packet_loss (const ping_context_t *ctx) /* {{{ */
" -4|-6 force the use of IPv4 or IPv6\n"
" -c count number of ICMP packets to send\n"
" -i interval interval with which to send ICMP packets\n"
" -4|-6 force the use of IPv4 or IPv6\n"
" -c count number of ICMP packets to send\n"
" -i interval interval with which to send ICMP packets\n"
+ " -w timeout time to wait for replies, in seconds\n"
" -t ttl time to live for each ICMP packet\n"
" -Q qos Quality of Service (QoS) of outgoing packets\n"
" Use \"-Q help\" for a list of valid options.\n"
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
" -t ttl time to live for each ICMP packet\n"
" -Q qos Quality of Service (QoS) of outgoing packets\n"
" Use \"-Q help\" for a list of valid options.\n"
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
- " -f filename filename to read hosts from\n"
+ " -m mark mark to set on outgoing packets\n"
+ " -f filename read hosts from <filename>\n"
+ " -O filename write RTT measurements to <filename>\n"
#if USE_NCURSES
" -u / -U force / disable UTF-8 output\n"
" -g graph graph type to draw\n"
#if USE_NCURSES
" -u / -U force / disable UTF-8 output\n"
" -g graph graph type to draw\n"
" -Z percent Exit with non-zero exit status if more than this percentage of\n"
" probes timed out. (default: never)\n"
" -Z percent Exit with non-zero exit status if more than this percentage of\n"
" probes timed out. (default: never)\n"
- "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n"
- "by Florian octo Forster <octo@verplant.org>\n"
+ "\noping "PACKAGE_VERSION", http://noping.cc/\n"
+ "by Florian octo Forster <ff@octo.it>\n"
"for contributions see `AUTHORS'\n",
name);
exit (status);
"for contributions see `AUTHORS'\n",
name);
exit (status);
while (1)
{
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:"
+ optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
#if USE_NCURSES
"uUg:"
#endif
#if USE_NCURSES
"uUg:"
#endif
}
break;
}
break;
+ case 'w':
+ {
+ char *endp = NULL;
+ double t = strtod (optarg, &endp);
+ if ((optarg[0] != 0) && (endp != NULL) && (*endp == 0))
+ opt_timeout = t;
+ else
+ fprintf (stderr, "Ignoring invalid timeout: %s\n",
+ optarg);
+ }
+ break;
+
case 'I':
{
if (opt_srcaddr != NULL)
case 'I':
{
if (opt_srcaddr != NULL)
opt_device = optarg;
break;
opt_device = optarg;
break;
+ case 'm':
+ opt_mark = optarg;
+ break;
+
case 't':
{
int new_send_ttl;
case 't':
{
int new_send_ttl;
set_opt_send_qos (optarg);
break;
set_opt_send_qos (optarg);
break;
+ case 'O':
+ {
+ free (opt_outfile);
+ opt_outfile = strdup (optarg);
+ }
+ break;
+
case 'P':
{
double new_percentile;
case 'P':
{
double new_percentile;
opt_show_graph = 0;
else if (strcasecmp ("prettyping", optarg) == 0)
opt_show_graph = 1;
opt_show_graph = 0;
else if (strcasecmp ("prettyping", optarg) == 0)
opt_show_graph = 1;
- else if (strcasecmp ("boxplot", optarg) == 0)
- opt_show_graph = 2;
else if (strcasecmp ("histogram", optarg) == 0)
else if (strcasecmp ("histogram", optarg) == 0)
+ opt_show_graph = 2;
+ else if (strcasecmp ("boxplot", optarg) == 0)
opt_show_graph = 3;
else
fprintf (stderr, "Unknown graph option: %s\n", optarg);
opt_show_graph = 3;
else
fprintf (stderr, "Unknown graph option: %s\n", optarg);
opt_utf8 = 1;
break;
#endif
opt_utf8 = 1;
break;
#endif
+ case 'b':
+ opt_bell = 1;
+ break;
case 'Z':
{
case 'Z':
{
return (EINVAL);
x_max -= 4;
return (EINVAL);
x_max -= 4;
+ /* Determine the first index in the history we need to draw
+ * the graph. */
history_offset = 0;
history_offset = 0;
- if (((size_t) x_max) < ctx->history_size)
+ if (((size_t) x_max) < ctx->history_size) /* window is smaller than history */
{
if (ctx->history_index > x_max)
history_offset = ctx->history_index - x_max;
else /* wrap around */
{
if (ctx->history_index > x_max)
history_offset = ctx->history_index - x_max;
else /* wrap around */
- history_offset = ctx->history_index + x_max - ctx->history_size;
+ history_offset = ctx->history_index + ctx->history_size - x_max;
+ }
+ else /* window is larger than history */
+ {
+ if (ctx->history_index != ctx->history_size) /* no longer growing. */
+ history_offset = ctx->history_index;
+ else /* start-up */
+ history_offset = 0;
}
for (x = 0; x < x_max; x++)
}
for (x = 0; x < x_max; x++)
@@ -1196,16 +1259,16 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
percentile = percentile_to_latency (ctx, opt_percentile);
mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
percentile = percentile_to_latency (ctx, opt_percentile);
mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
- "RTT[ms]: min = %.0f, median = %.0f, p(%.0f) = %.0f, max = %.0f",
+ "RTT[ms]: min = %.0f, median = %.0f, p(%.0f) = %.0f, max = %.0f ",
min, median, opt_percentile, percentile, max);
}
if (opt_show_graph == 1)
update_graph_prettyping (ctx, latency, sequence);
else if (opt_show_graph == 2)
min, median, opt_percentile, percentile, max);
}
if (opt_show_graph == 1)
update_graph_prettyping (ctx, latency, sequence);
else if (opt_show_graph == 2)
- update_graph_boxplot (ctx);
- else if (opt_show_graph == 3)
update_graph_histogram (ctx);
update_graph_histogram (ctx);
+ else if (opt_show_graph == 3)
+ update_graph_boxplot (ctx);
wrefresh (ctx->window);
wrefresh (ctx->window);
#if USE_NCURSES
if (has_colors () == TRUE)
{
#if USE_NCURSES
if (has_colors () == TRUE)
{
- double percentile;
+ double ratio;
int color = OPING_GREEN;
int color = OPING_GREEN;
- percentile = latency_to_percentile (context, latency);
- if (percentile < (100.0 * threshold_green))
+ ratio = latency_to_ratio (context, latency);
+ if (ratio < threshold_green)
color = OPING_GREEN;
color = OPING_GREEN;
- else if (percentile < (100.0 * threshold_yellow))
+ else if (ratio < threshold_yellow)
color = OPING_YELLOW;
else
color = OPING_RED;
color = OPING_YELLOW;
else
color = OPING_RED;
-#if 0
- if ((ratio_this <= threshold_green)
- || ((ratio_prev < threshold_green)
- && (ratio_this > threshold_green)))
- color = OPING_GREEN;
- else if ((ratio_this <= threshold_yellow)
- || ((ratio_prev < threshold_yellow)
- && (ratio_this > threshold_yellow)))
- color = OPING_YELLOW;
- else
- color = OPING_RED;
-#endif
-
HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
data_len, context->host, context->addr,
sequence, recv_ttl,
HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
data_len, context->host, context->addr,
sequence, recv_ttl,
#if USE_NCURSES
}
#endif
#if USE_NCURSES
}
#endif
+ if (opt_bell) {
+#if USE_NCURSES
+ beep();
+#else
+ HOST_PRINTF ("\a");
+#endif
+ }
}
else /* if (!(latency > 0.0)) */
{
}
else /* if (!(latency > 0.0)) */
{
#endif
}
#endif
}
+ if (outfile != NULL)
+ {
+ struct timespec ts = { 0, 0 };
+
+ if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
+ {
+ double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
+
+ if ((sequence % 32) == 0)
+ fprintf (outfile, "#time,host,latency[ms]\n");
+
+ fprintf (outfile, "%.3f,\"%s\",%.2f\n", t, context->host, latency);
+ }
+ }
+
#if USE_NCURSES
update_stats_from_context (context, iter);
wrefresh (main_win);
#if USE_NCURSES
update_stats_from_context (context, iter);
wrefresh (main_win);
}
#endif
}
#endif
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, "");
optind = read_options (argc, argv);
#if !_POSIX_SAVED_IDS
optind = read_options (argc, argv);
#if !_POSIX_SAVED_IDS
/* printf ("ts_int = %i.%09li\n", (int) ts_int.tv_sec, ts_int.tv_nsec); */
}
/* printf ("ts_int = %i.%09li\n", (int) ts_int.tv_sec, ts_int.tv_nsec); */
}
+ if (ping_setopt (ping, PING_OPT_TIMEOUT, (void*)(&opt_timeout)) != 0)
+ {
+ fprintf (stderr, "Setting timeout failed: %s\n",
+ ping_get_error (ping));
+ }
+
if (opt_addrfamily != PING_DEF_AF)
ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily);
if (opt_addrfamily != PING_DEF_AF)
ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily);
}
}
}
}
+ if (opt_mark != NULL)
+ {
+ char *endp = NULL;
+ int mark = (int) strtol (opt_mark, &endp, /* base = */ 0);
+ if ((opt_mark[0] != 0) && (endp != NULL) && (*endp == 0))
+ {
+ if (ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0)
+ {
+ fprintf (stderr, "Setting mark failed: %s\n",
+ ping_get_error (ping));
+ }
+ }
+ else
+ {
+ fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
+ }
+ }
+
if (opt_filename != NULL)
{
FILE *infile;
if (opt_filename != NULL)
{
FILE *infile;
saved_set_uid = (uid_t) -1;
#endif
saved_set_uid = (uid_t) -1;
#endif
+ if (opt_outfile != NULL)
+ {
+ outfile = fopen (opt_outfile, "a");
+ if (outfile == NULL)
+ {
+ fprintf (stderr, "opening \"%s\" failed: %s\n",
+ opt_outfile, strerror (errno));
+ exit (EXIT_FAILURE);
+ }
+ }
+
ping_initialize_contexts (ping);
if (i == 0)
ping_initialize_contexts (ping);
if (i == 0)
ping_destroy (ping);
ping_destroy (ping);
+ if (outfile != NULL)
+ {
+ fclose (outfile);
+ outfile = NULL;
+ }
+
if (status == 0)
exit (EXIT_SUCCESS);
else
if (status == 0)
exit (EXIT_SUCCESS);
else