![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/oping.c b/src/oping.c
index 3ae226c6f5e64d25e31d3ab3d960e0e673a8289f..d0e9f3344134dd0b01d0ea0ecef1cdb5e5e02ed8 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
/**
* 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
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 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;
memcpy (ctx->history_by_value, ctx->history_by_time,
sizeof (ctx->history_by_time));
+ /* Remove impossible values caused by adding a new host */
+ for (i = 0; i < ctx->history_size; i++)
+ if (ctx->history_by_value[i]<0)
+ ctx->history_by_value[i]=NAN;
+
/* Sort all RTTs. */
qsort (ctx->history_by_value, ctx->history_size, sizeof
(ctx->history_by_value[0]), compare_double);
{
pingobj_iter_t *iter;
int index;
+ size_t history_size = 0;
if (ping == NULL)
return (EINVAL);
ping_context_t *context;
size_t buffer_size;
+ context = ping_iterator_get_context(iter);
+
+ /* if this is a previously existing host, do not recreate it */
+ if (context != NULL) {
+ history_size = context->history_size;
+ context->index = index++;
+ continue;
+ }
+
context = context_create ();
context->index = index;
+ /* start new hosts at the same graph point as old hosts */
+ context->history_size = history_size;
+ context->history_index = history_size;
+ for (int i = 0; i<history_size; i++) {
+ context->history_by_time[i] = -1;
+ }
+
buffer_size = sizeof (context->host);
ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
" 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"
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:w:"
+ optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
#if USE_NCURSES
"uUg:"
#endif
opt_device = optarg;
break;
+ case 'm':
+ opt_mark = optarg;
+ break;
+
case 't':
{
int new_send_ttl;
set_opt_send_qos (optarg);
break;
+ case 'O':
+ {
+ free (opt_outfile);
+ opt_outfile = strdup (optarg);
+ }
+ break;
+
case 'P':
{
double new_percentile;
opt_utf8 = 1;
break;
#endif
+ case 'b':
+ opt_bell = 1;
+ break;
case 'Z':
{
} /* }}} int update_graph_boxplot */
static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
- double latency, unsigned int sequence)
+ double latency)
{
size_t x;
size_t x_max;
index = (history_offset + x) % ctx->history_size;
latency = ctx->history_by_time[index];
+ if (latency < 0) {
+ continue;
+ }
+
if (latency >= 0.0)
{
double ratio;
@@ -1197,12 +1243,6 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
ping_iterator_get_info (iter, PING_INFO_LATENCY,
&latency, &buffer_len);
- unsigned int sequence = 0;
- buffer_len = sizeof (sequence);
- ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
- &sequence, &buffer_len);
-
-
if ((ctx == NULL) || (ctx->window == NULL))
return (EINVAL);
@@ -1238,7 +1278,7 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
}
if (opt_show_graph == 1)
- update_graph_prettyping (ctx, latency, sequence);
+ update_graph_prettyping (ctx, latency);
else if (opt_show_graph == 2)
update_graph_histogram (ctx);
else if (opt_show_graph == 3)
else if (opt_show_graph > 0)
opt_show_graph++;
}
+ else if (key == 'a')
+ {
+ char host[80];
+
+ wprintw(main_win, "New Host: ");
+ echo();
+ wgetnstr(main_win, host, sizeof(host));
+ noecho();
+
+ if (ping_host_add(ping, host) < 0)
+ {
+ const char *errmsg = ping_get_error (ping);
+
+ wprintw (main_win, "Adding host `%s' failed: %s\n", host, errmsg);
+ }
+ else
+ {
+ int box_height = (opt_show_graph == 0) ? 4 : 5;
+
+ /* make sure old data is still visible */
+ for (int i = 0; i<box_height; i++)
+ wprintw (main_win, "\n");
+
+ need_resize = 1;
+ host_num++;
+ ping_initialize_contexts(ping);
+ }
+ }
}
if (need_resize)
#if USE_NCURSES
}
#endif
+ if (opt_bell) {
+#if USE_NCURSES
+ beep();
+#else
+ HOST_PRINTF ("\a");
+#endif
+ }
}
else /* if (!(latency > 0.0)) */
{
#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 (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;
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_destroy (ping);
+ if (outfile != NULL)
+ {
+ fclose (outfile);
+ outfile = NULL;
+ }
+
if (status == 0)
exit (EXIT_SUCCESS);
else