diff --git a/src/oping.c b/src/oping.c
index 6263a4def36459c7d94c8dbbb362cc89b56a9f6e..87ca81a911ea7f7da8fad01d938fca0e2c6feffe 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-2017 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
* and HISTORY_SIZE_MAX. */
size_t history_size;
* and HISTORY_SIZE_MAX. */
size_t history_size;
- /* Number "received" entries in the history, i.e. non-NAN entries. */
+ /* Total number of reponses received. */
size_t history_received;
/* Index of the next RTT to be written to history_by_time. This wraps
size_t history_received;
/* Index of the next RTT to be written to history_by_time. This wraps
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;
opt_count = 0;
} /* }}} void sigint_handler */
opt_count = 0;
} /* }}} void sigint_handler */
-static ping_context_t *context_create (void) /* {{{ */
+static ping_context_t *context_create () /* {{{ */
{
{
- ping_context_t *ret;
-
- if ((ret = malloc (sizeof (ping_context_t))) == NULL)
+ ping_context_t *ctx = calloc (1, sizeof (*ctx));
+ if (ctx == NULL)
return (NULL);
return (NULL);
- memset (ret, '\0', sizeof (ping_context_t));
-
- ret->latency_total = 0.0;
-
#if USE_NCURSES
#if USE_NCURSES
- ret->window = NULL;
+ ctx->window = NULL;
#endif
#endif
- return (ret);
+ return (ctx);
} /* }}} ping_context_t *context_create */
static void context_destroy (ping_context_t *context) /* {{{ */
} /* }}} ping_context_t *context_create */
static void context_destroy (ping_context_t *context) /* {{{ */
memcpy (ctx->history_by_value, ctx->history_by_time,
sizeof (ctx->history_by_time));
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);
/* 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;
{
pingobj_iter_t *iter;
int index;
+ size_t history_size = 0;
if (ping == NULL)
return (EINVAL);
if (ping == NULL)
return (EINVAL);
{
ping_context_t *context;
size_t buffer_size;
{
ping_context_t *context;
size_t buffer_size;
+ int i;
+
+ 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;
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 (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);
buffer_size = sizeof (context->host);
ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
" -m mark mark to set on outgoing packets\n"
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
" -m mark mark to set on outgoing packets\n"
- " -f filename filename to read hosts from\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"
while (1)
{
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:m:w:"
+ 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
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_utf8 = 1;
break;
#endif
opt_utf8 = 1;
break;
#endif
+ case 'b':
+ opt_bell = 1;
+ break;
case 'Z':
{
case 'Z':
{
} /* }}} int update_graph_boxplot */
static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
} /* }}} 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;
{
size_t x;
size_t x_max;
index = (history_offset + x) % ctx->history_size;
latency = ctx->history_by_time[index];
index = (history_offset + x) % ctx->history_size;
latency = ctx->history_by_time[index];
+ if (latency < 0) {
+ continue;
+ }
+
if (latency >= 0.0)
{
double ratio;
if (latency >= 0.0)
{
double ratio;
@@ -1203,12 +1245,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);
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);
if ((ctx == NULL) || (ctx->window == NULL))
return (EINVAL);
@@ -1244,7 +1280,7 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
}
if (opt_show_graph == 1)
}
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 == 2)
update_graph_histogram (ctx);
else if (opt_show_graph == 3)
if (context->window != NULL)
{
if (context->window != NULL)
{
+ werase (context->window);
+ wrefresh (context->window);
delwin (context->window);
context->window = NULL;
}
delwin (context->window);
context->window = NULL;
}
else if (opt_show_graph > 0)
opt_show_graph++;
}
else if (opt_show_graph > 0)
opt_show_graph++;
}
+ else if (key == 'a')
+ {
+ char host[NI_MAXHOST];
+
+ 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
+ {
+ /* FIXME - scroll main_win correctly so that old
+ * data is still visible */
+ need_resize = 1;
+ host_num = ping_iterator_count(ping);
+ ping_initialize_contexts(ping);
+ }
+ }
}
if (need_resize)
}
if (need_resize)
if (has_colors () == TRUE)
{
start_color ();
if (has_colors () == TRUE)
{
start_color ();
- init_pair (OPING_GREEN, COLOR_GREEN, /* default = */ 0);
- init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ 0);
- init_pair (OPING_RED, COLOR_RED, /* default = */ 0);
- init_pair (OPING_GREEN_HIST, COLOR_GREEN, COLOR_BLACK);
+ use_default_colors ();
+ init_pair (OPING_GREEN, COLOR_GREEN, /* default = */ -1);
+ init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ -1);
+ init_pair (OPING_RED, COLOR_RED, /* default = */ -1);
+ init_pair (OPING_GREEN_HIST, COLOR_GREEN, -1);
init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW);
}
init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW);
}
#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 timeval tv = {0};
+ if (gettimeofday (&tv, NULL) == 0)
+ {
+ double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.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);
}
}
}
}
- if(opt_mark != NULL)
+ if (opt_mark != NULL)
{
{
- char *endp;
- int mark = strtoul(opt_mark, &endp, 0);
- if(opt_mark[0] != '\0' && *endp == '\0')
+ 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)
+ if (ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0)
{
fprintf (stderr, "Setting mark failed: %s\n",
ping_get_error (ping));
}
}
{
fprintf (stderr, "Setting mark failed: %s\n",
ping_get_error (ping));
}
}
- else{
+ else
+ {
fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
}
}
fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
}
}
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