diff --git a/src/oping.c b/src/oping.c
index bf494bac0f2aab6543759eb2ed22086e9c9fa1ab..b53974f3c4eacac748778892c0c189b84c022476 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
#endif
#if USE_NCURSES
+# define NCURSES_OPAQUE 1
# include <ncurses.h>
+
+# define OPING_GREEN 1
+# define OPING_YELLOW 2
+# define OPING_RED 3
#endif
#include "oping.h"
char host[NI_MAXHOST];
char addr[NI_MAXHOST];
+ int index;
int req_sent;
int req_rcvd;
static int opt_count = -1;
static int opt_send_ttl = 64;
+static int host_num = 0;
+
#if USE_NCURSES
static WINDOW *main_win = NULL;
#endif
-static void sigint_handler (int signal)
+static void sigint_handler (int signal) /* {{{ */
{
/* Make compiler happy */
signal = 0;
/* Exit the loop */
opt_count = 0;
-}
+} /* }}} void sigint_handler */
-static ping_context_t *context_create (void)
+static ping_context_t *context_create (void) /* {{{ */
{
ping_context_t *ret;
#endif
return (ret);
-}
+} /* }}} ping_context_t *context_create */
-static void context_destroy (ping_context_t *context)
+static void context_destroy (ping_context_t *context) /* {{{ */
{
if (context == NULL)
return;
#endif
free (context);
-}
+} /* }}} void context_destroy */
+
+static double context_get_average (ping_context_t *ctx) /* {{{ */
+{
+ double num_total;
+
+ if (ctx == NULL)
+ return (-1.0);
-static void usage_exit (const char *name, int status)
+ if (ctx->req_rcvd < 1)
+ return (-0.0);
+
+ num_total = (double) ctx->req_rcvd;
+ return (ctx->latency_total / num_total);
+} /* }}} double context_get_average */
+
+static double context_get_stddev (ping_context_t *ctx) /* {{{ */
{
- int name_length;
+ double num_total;
+
+ if (ctx == NULL)
+ return (-1.0);
+
+ if (ctx->req_rcvd < 1)
+ return (-0.0);
+ else if (ctx->req_rcvd < 2)
+ return (0.0);
+
+ num_total = (double) ctx->req_rcvd;
+ return (sqrt (((num_total * ctx->latency_total_square)
+ - (ctx->latency_total * ctx->latency_total))
+ / (num_total * (num_total - 1.0))));
+} /* }}} double context_get_stddev */
+
+static double context_get_packet_loss (const ping_context_t *ctx) /* {{{ */
+{
+ if (ctx == NULL)
+ return (-1.0);
+
+ if (ctx->req_sent < 1)
+ return (0.0);
+
+ return (100.0 * (ctx->req_sent - ctx->req_rcvd)
+ / ((double) ctx->req_sent));
+} /* }}} double context_get_packet_loss */
+
+static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
+{
+ pingobj_iter_t *iter;
+ int index;
+
+ if (ping == NULL)
+ return (EINVAL);
+
+ index = 0;
+ for (iter = ping_iterator_get (ping);
+ iter != NULL;
+ iter = ping_iterator_next (iter))
+ {
+ ping_context_t *context;
+ size_t buffer_size;
+
+ context = context_create ();
+ context->index = index;
- name_length = (int) strlen (name);
+ buffer_size = sizeof (context->host);
+ ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
+
+ buffer_size = sizeof (context->addr);
+ ping_iterator_get_info (iter, PING_INFO_ADDRESS, context->addr, &buffer_size);
+
+ ping_iterator_set_context (iter, (void *) context);
+
+ index++;
+ }
+
+ return (0);
+} /* }}} int ping_initialize_contexts */
+static void usage_exit (const char *name, int status) /* {{{ */
+{
fprintf (stderr, "Usage: %s [OPTIONS] "
"-f filename | host [host [host ...]]\n"
"for contributions see `AUTHORS'\n",
name);
exit (status);
-}
+} /* }}} void usage_exit */
-static int read_options (int argc, char **argv)
+static int read_options (int argc, char **argv) /* {{{ */
{
int optchar;
}
return (optind);
-}
+} /* }}} read_options */
-static void print_host (pingobj_iter_t *iter)
-{
- double latency;
- unsigned int sequence;
- int recv_ttl;
- size_t buffer_len;
- size_t data_len;
- ping_context_t *context;
-
- latency = -1.0;
- buffer_len = sizeof (latency);
- ping_iterator_get_info (iter, PING_INFO_LATENCY,
- &latency, &buffer_len);
-
- sequence = 0;
- buffer_len = sizeof (sequence);
- ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
- &sequence, &buffer_len);
-
- recv_ttl = -1;
- buffer_len = sizeof (recv_ttl);
- ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
- &recv_ttl, &buffer_len);
-
- data_len = 0;
- ping_iterator_get_info (iter, PING_INFO_DATA,
- NULL, &data_len);
-
- context = (ping_context_t *) ping_iterator_get_context (iter);
-
-#if USE_NCURSES
-# define HOST_PRINTF(...) wprintw(main_win, __VA_ARGS__)
-#else
-# define HOST_PRINTF(...) printf(__VA_ARGS__)
-#endif
-
- context->req_sent++;
- if (latency > 0.0)
- {
- 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;
-
- HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i "
- "time=%.2f ms\n",
- data_len,
- context->host, context->addr,
- sequence, recv_ttl, latency);
- }
- else
- {
- HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u timeout\n",
- context->host, context->addr,
- sequence);
- }
-
-#if USE_NCURSES
- wrefresh (main_win);
- werase (context->window);
- box (context->window, 0, 0);
- mvwprintw (context->window, /* y = */ 0, /* x = */ 5,
- " %s ping statistics ",
- context->host);
- mvwprintw (context->window, /* y = */ 1, /* x = */ 2,
- "%i packets transmitted, %i received, %.2f%% packet "
- "loss, time %.1fms",
- 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 (((num_total * context->latency_total_square) - (context->latency_total * context->latency_total))
- / (num_total * (num_total - 1.0)));
-
- mvwprintw (context->window, /* y = */ 2, /* x = */ 2,
- "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
- context->latency_min,
- average,
- context->latency_max,
- deviation);
- }
- wrefresh (context->window);
-#endif
-}
-
-static void time_normalize (struct timespec *ts)
+static void time_normalize (struct timespec *ts) /* {{{ */
{
while (ts->tv_nsec < 0)
{
ts->tv_sec += 1;
ts->tv_nsec -= 1000000000;
}
-}
+} /* }}} void time_normalize */
static void time_calc (struct timespec *ts_dest, /* {{{ */
const struct timespec *ts_int,
time_normalize (ts_dest);
} /* }}} void time_calc */
-static int print_header (pingobj_t *ping) /* {{{ */
+#if USE_NCURSES
+static int update_stats_from_context (ping_context_t *ctx) /* {{{ */
+{
+ if ((ctx == NULL) || (ctx->window == NULL))
+ return (EINVAL);
+
+ werase (ctx->window);
+
+ box (ctx->window, 0, 0);
+ wattron (ctx->window, A_BOLD);
+ mvwprintw (ctx->window, /* y = */ 0, /* x = */ 5,
+ " %s ", ctx->host);
+ wattroff (ctx->window, A_BOLD);
+ wprintw (ctx->window, "ping statistics ");
+ mvwprintw (ctx->window, /* y = */ 1, /* x = */ 2,
+ "%i packets transmitted, %i received, %.2f%% packet "
+ "loss, time %.1fms",
+ ctx->req_sent, ctx->req_rcvd,
+ context_get_packet_loss (ctx),
+ ctx->latency_total);
+ if (ctx->req_rcvd != 0)
+ {
+ double average;
+ double deviation;
+
+ average = context_get_average (ctx);
+ deviation = context_get_stddev (ctx);
+
+ mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
+ "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
+ ctx->latency_min,
+ average,
+ ctx->latency_max,
+ deviation);
+ }
+
+ wrefresh (ctx->window);
+
+ return (0);
+} /* }}} int update_stats_from_context */
+
+static int on_resize (pingobj_t *ping) /* {{{ */
{
pingobj_iter_t *iter;
- int i;
+ int width = 0;
+ int height = 0;
+ int main_win_height;
+
+ getmaxyx (stdscr, height, width);
+ if ((height < 1) || (width < 1))
+ return (EINVAL);
+
+ main_win_height = height - (4 * host_num);
+ wresize (main_win, main_win_height, /* width = */ width);
+ /* Allow scrolling */
+ scrollok (main_win, TRUE);
+ /* wsetscrreg (main_win, 0, main_win_height - 1); */
+ /* Allow hardware accelerated scrolling. */
+ idlok (main_win, TRUE);
+ wrefresh (main_win);
+
+ for (iter = ping_iterator_get (ping);
+ iter != NULL;
+ iter = ping_iterator_next (iter))
+ {
+ ping_context_t *context;
+
+ context = ping_iterator_get_context (iter);
+ if (context == NULL)
+ continue;
+
+ if (context->window != NULL)
+ {
+ delwin (context->window);
+ context->window = NULL;
+ }
+ context->window = newwin (/* height = */ 4,
+ /* width = */ 0,
+ /* y = */ main_win_height + (4 * context->index),
+ /* x = */ 0);
+ }
+
+ return (0);
+} /* }}} */
+
+static int check_resize (pingobj_t *ping) /* {{{ */
+{
+ int need_resize = 0;
+
+ while (42)
+ {
+ int key = wgetch (stdscr);
+ if (key == ERR)
+ break;
+ else if (key == KEY_RESIZE)
+ need_resize = 1;
+ }
+
+ if (need_resize)
+ return (on_resize (ping));
+ else
+ return (0);
+} /* }}} int check_resize */
+
+static int pre_loop_hook (pingobj_t *ping) /* {{{ */
+{
+ pingobj_iter_t *iter;
+ int width = 0;
+ int height = 0;
+ int main_win_height;
-#if USE_NCURSES
initscr ();
cbreak ();
noecho ();
-#endif
+ nodelay (stdscr, TRUE);
+
+ getmaxyx (stdscr, height, width);
+ if ((height < 1) || (width < 1))
+ return (EINVAL);
+
+ 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);
+ }
+
+ main_win_height = height - (4 * host_num);
+ main_win = newwin (/* height = */ main_win_height,
+ /* width = */ 0,
+ /* y = */ 0, /* x = */ 0);
+ /* Allow scrolling */
+ scrollok (main_win, TRUE);
+ /* wsetscrreg (main_win, 0, main_win_height - 1); */
+ /* Allow hardware accelerated scrolling. */
+ idlok (main_win, TRUE);
+ wmove (main_win, /* y = */ main_win_height - 1, /* x = */ 0);
+ wrefresh (main_win);
- i = 0;
for (iter = ping_iterator_get (ping);
iter != NULL;
iter = ping_iterator_next (iter))
{
ping_context_t *context;
- size_t buffer_size;
- context = context_create ();
+ context = ping_iterator_get_context (iter);
+ if (context == NULL)
+ continue;
- buffer_size = sizeof (context->host);
- ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
+ if (context->window != NULL)
+ {
+ delwin (context->window);
+ context->window = NULL;
+ }
+ context->window = newwin (/* height = */ 4,
+ /* width = */ 0,
+ /* y = */ main_win_height + (4 * context->index),
+ /* x = */ 0);
+ }
- buffer_size = sizeof (context->addr);
- ping_iterator_get_info (iter, PING_INFO_ADDRESS, context->addr, &buffer_size);
+
+ /* Don't know what good this does exactly, but without this code
+ * "check_resize" will be called right after startup and *somehow*
+ * this leads to display errors. If we purge all initial characters
+ * here, the problem goes away. "wgetch" is non-blocking due to
+ * "nodelay" (see above). */
+ while (wgetch (stdscr) != ERR)
+ {
+ /* eat up characters */;
+ }
+
+ return (0);
+} /* }}} int pre_loop_hook */
+
+static int pre_sleep_hook (pingobj_t *ping) /* {{{ */
+{
+ return (check_resize (ping));
+} /* }}} int pre_sleep_hook */
+
+static int post_sleep_hook (pingobj_t *ping) /* {{{ */
+{
+ return (check_resize (ping));
+} /* }}} int pre_sleep_hook */
+#else /* if !USE_NCURSES */
+static int pre_loop_hook (pingobj_t *ping) /* {{{ */
+{
+ pingobj_iter_t *iter;
+
+ for (iter = ping_iterator_get (ping);
+ iter != NULL;
+ iter = ping_iterator_next (iter))
+ {
+ ping_context_t *ctx;
+ size_t buffer_size;
+
+ ctx = ping_iterator_get_context (iter);
+ if (ctx == NULL)
+ continue;
buffer_size = 0;
ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size);
-#if USE_NCURSES
- context->window = newwin (/* height = */ 4, COLS,
- /* start y = */ 4*i, /* start x = */ 0);
- box (context->window, 0, 0);
- mvwprintw (context->window, /* y = */ 0, /* x = */ 5,
- " %s ping statistics ",
- context->host);
- wrefresh (context->window);
-#else /* !USE_NCURSES */
printf ("PING %s (%s) %zu bytes of data.\n",
- context->host, context->addr, buffer_size);
+ ctx->host, ctx->addr, buffer_size);
+ }
+
+ return (0);
+} /* }}} int pre_loop_hook */
+
+static int pre_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */
+{
+ fflush (stdout);
+
+ return (0);
+} /* }}} int pre_sleep_hook */
+
+static int post_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */
+{
+ return (0);
+} /* }}} int post_sleep_hook */
#endif
- ping_iterator_set_context (iter, (void *) context);
+static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
+ int index)
+{
+ double latency;
+ unsigned int sequence;
+ int recv_ttl;
+ size_t buffer_len;
+ size_t data_len;
+ ping_context_t *context;
- i++;
- }
+ latency = -1.0;
+ buffer_len = sizeof (latency);
+ ping_iterator_get_info (iter, PING_INFO_LATENCY,
+ &latency, &buffer_len);
+
+ sequence = 0;
+ buffer_len = sizeof (sequence);
+ ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
+ &sequence, &buffer_len);
+
+ recv_ttl = -1;
+ buffer_len = sizeof (recv_ttl);
+ ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
+ &recv_ttl, &buffer_len);
+
+ data_len = 0;
+ ping_iterator_get_info (iter, PING_INFO_DATA,
+ NULL, &data_len);
+
+ context = (ping_context_t *) ping_iterator_get_context (iter);
#if USE_NCURSES
- delwin (main_win);
- main_win = newwin (LINES - 4*i, COLS, 4*i, 0);
- scrollok (main_win, TRUE);
+# define HOST_PRINTF(...) wprintw(main_win, __VA_ARGS__)
+#else
+# define HOST_PRINTF(...) printf(__VA_ARGS__)
#endif
- return (0);
-} /* }}} int print_header */
+ context->req_sent++;
+ if (latency > 0.0)
+ {
+ context->req_rcvd++;
+ context->latency_total += latency;
+ context->latency_total_square += (latency * latency);
-static int print_footer (pingobj_t *ping)
+ 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;
+
+#if USE_NCURSES
+ if (has_colors () == TRUE)
+ {
+ int color = OPING_GREEN;
+ double average = context_get_average (context);
+ double stddev = context_get_stddev (context);
+
+ if ((latency < (average - (2 * stddev)))
+ || (latency > (average + (2 * stddev))))
+ color = OPING_RED;
+ else if ((latency < (average - stddev))
+ || (latency > (average + stddev)))
+ color = OPING_YELLOW;
+
+ HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i "
+ "time=",
+ data_len, context->host, context->addr,
+ sequence, recv_ttl);
+ wattron (main_win, COLOR_PAIR(color));
+ HOST_PRINTF ("%.2f", latency);
+ wattroff (main_win, COLOR_PAIR(color));
+ HOST_PRINTF (" ms\n");
+ }
+ else
+ {
+#endif
+ HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i "
+ "time=%.2f ms\n",
+ data_len,
+ context->host, context->addr,
+ sequence, recv_ttl, latency);
+#if USE_NCURSES
+ }
+#endif
+ }
+ else
+ {
+#if USE_NCURSES
+ if (has_colors () == TRUE)
+ {
+ HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u ",
+ context->host, context->addr,
+ sequence);
+ wattron (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
+ HOST_PRINTF ("timeout");
+ wattroff (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
+ HOST_PRINTF ("\n");
+ }
+ else
+ {
+#endif
+ HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u timeout\n",
+ context->host, context->addr,
+ sequence);
+#if USE_NCURSES
+ }
+#endif
+ }
+
+#if USE_NCURSES
+ update_stats_from_context (context);
+ wrefresh (main_win);
+#endif
+} /* }}} void update_host_hook */
+
+static int post_loop_hook (pingobj_t *ping) /* {{{ */
{
pingobj_iter_t *iter;
printf ("\n--- %s ping statistics ---\n"
"%i packets transmitted, %i received, %.2f%% packet loss, time %.1fms\n",
context->host, context->req_sent, context->req_rcvd,
- 100.0 * (context->req_sent - context->req_rcvd) / ((double) context->req_sent),
+ context_get_packet_loss (context),
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 (((num_total * context->latency_total_square) - (context->latency_total * context->latency_total))
- / (num_total * (num_total - 1.0)));
+ average = context_get_average (context);
+ deviation = context_get_stddev (context);
printf ("rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n",
context->latency_min,
}
return (0);
-} /* }}} int print_footer */
+} /* }}} int post_loop_hook */
int main (int argc, char **argv) /* {{{ */
{
fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
continue;
}
+ else
+ {
+ host_num++;
+ }
}
#if _POSIX_SAVED_IDS
fprintf (stderr, "Adding host `%s' failed: %s\n", argv[i], errmsg);
continue;
}
+ else
+ {
+ host_num++;
+ }
}
/* Permanently drop root privileges if we're setuid-root. */
saved_set_uid = (uid_t) -1;
#endif
- print_header (ping);
+ ping_initialize_contexts (ping);
if (i == 0)
return (1);
return (1);
}
+ pre_loop_hook (ping);
+
while (opt_count != 0)
{
+ int index;
int status;
if (gettimeofday (&tv_begin, NULL) < 0)
return (1);
}
+ index = 0;
for (iter = ping_iterator_get (ping);
iter != NULL;
iter = ping_iterator_next (iter))
{
- print_host (iter);
+ update_host_hook (iter, index);
+ index++;
}
- fflush (stdout);
+
+ pre_sleep_hook (ping);
/* Don't sleep in the last iteration */
if (opt_count == 1)
}
}
+ post_sleep_hook (ping);
+
if (opt_count > 0)
opt_count--;
} /* while (opt_count != 0) */
- print_footer (ping);
+ post_loop_hook (ping);
ping_destroy (ping);