diff --git a/src/oping.c b/src/oping.c
index fc4cb5faeb5f9cdbd393188ca8596e8d2db5bc43..8286db0ea00d633774bba68828c22cf9f0bf1f8f 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 Florian octo Forster <octo at verplant.org>
+ * Copyright (C) 2006-2010 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
# include <stdlib.h>
# include <stdio.h>
# include <string.h>
# include <stdlib.h>
# include <stdio.h>
# include <string.h>
+# include <stdint.h>
+# include <inttypes.h>
# include <errno.h>
# include <assert.h>
#else
# error "You don't have the standard C99 header files installed"
#endif /* STDC_HEADERS */
# include <errno.h>
# include <assert.h>
#else
# error "You don't have the standard C99 header files installed"
#endif /* STDC_HEADERS */
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
#if HAVE_MATH_H
# include <math.h>
#endif
#if HAVE_MATH_H
# include <math.h>
#endif
# endif
#endif
# endif
#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_NETINET_IP_H
+# include <netinet/ip.h>
+#endif
+
#if HAVE_NETDB_H
# include <netdb.h> /* NI_MAXHOST */
#endif
#if HAVE_NETDB_H
# include <netdb.h> /* NI_MAXHOST */
#endif
# include <signal.h>
#endif
# include <signal.h>
#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#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"
#include "oping.h"
+#ifndef _POSIX_SAVED_IDS
+# define _POSIX_SAVED_IDS 0
+#endif
+
+/* Remove GNU specific __attribute__ settings when using another compiler */
+#if !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
typedef struct ping_context
{
char host[NI_MAXHOST];
char addr[NI_MAXHOST];
typedef struct ping_context
{
char host[NI_MAXHOST];
char addr[NI_MAXHOST];
+ int index;
int req_sent;
int req_rcvd;
int req_sent;
int req_rcvd;
double latency_max;
double latency_total;
double latency_total_square;
double latency_max;
double latency_total;
double latency_total_square;
+
+#if USE_NCURSES
+ WINDOW *window;
+#endif
} ping_context_t;
static double opt_interval = 1.0;
} ping_context_t;
static double opt_interval = 1.0;
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 uint8_t opt_send_qos = 0;
+
+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;
{
/* 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;
{
ping_context_t *ret;
ret->latency_total = 0.0;
ret->latency_total_square = 0.0;
ret->latency_total = 0.0;
ret->latency_total_square = 0.0;
+#if USE_NCURSES
+ ret->window = NULL;
+#endif
+
return (ret);
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;
+
+#if USE_NCURSES
+ if (context->window != NULL)
+ {
+ delwin (context->window);
+ context->window = NULL;
+ }
+#endif
+
free (context);
free (context);
-}
+} /* }}} void context_destroy */
+
+static double context_get_average (ping_context_t *ctx) /* {{{ */
+{
+ double num_total;
+
+ if (ctx == NULL)
+ return (-1.0);
+
+ 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 void usage_exit (const char *name, int status)
+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;
- name_length = (int) strlen (name);
+ context = context_create ();
+ context->index = index;
+
+ 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"
fprintf (stderr, "Usage: %s [OPTIONS] "
"-f filename | host [host [host ...]]\n"
" -c count number of ICMP packets to send\n"
" -i interval interval with which to send ICMP packets\n"
" -t ttl time to live for each ICMP packet\n"
" -c count number of ICMP packets to send\n"
" -i interval interval with which to send ICMP packets\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"
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
" -f filename filename to read hosts from\n"
"for contributions see `AUTHORS'\n",
name);
exit (status);
"for contributions see `AUTHORS'\n",
name);
exit (status);
-}
+} /* }}} void usage_exit */
-static int read_options (int argc, char **argv)
+static void usage_qos_exit (const char *arg, int status) /* {{{ */
+{
+ if (arg != 0)
+ fprintf (stderr, "Invalid QoS argument: \"%s\"\n\n", arg);
+
+ fprintf (stderr, "Valid QoS arguments (option \"-Q\") are:\n"
+ "\n"
+ " Differentiated Services (IPv4 and IPv6, RFC 2474)\n"
+ "\n"
+ " be Best Effort (BE, default PHB).\n"
+ " ef Expedited Forwarding (EF) PHB group (RFC 3246).\n"
+ " (low delay, low loss, low jitter)\n"
+ " va Voice Admit (VA) DSCP (RFC 5865).\n"
+ " (capacity-admitted traffic)\n"
+ " af[1-4][1-3] Assured Forwarding (AF) PHB group (RFC 2597).\n"
+ " For example: \"af12\" (class 1, precedence 2)\n"
+ " cs[0-7] Class Selector (CS) PHB group (RFC 2474).\n"
+ " For example: \"cs1\" (priority traffic)\n"
+ "\n"
+ " Type of Service (IPv4, RFC 1349, obsolete)\n"
+ "\n"
+ " lowdelay (%#04x) minimize delay\n"
+ " throughput (%#04x) maximize throughput\n"
+ " reliability (%#04x) maximize reliability\n"
+ " mincost (%#04x) minimize monetary cost\n"
+ "\n"
+ " Specify manually\n"
+ "\n"
+ " 0x00 - 0xff Hexadecimal numeric specification.\n"
+ " 0 - 255 Decimal numeric specification.\n"
+ "\n",
+ (unsigned int) IPTOS_LOWDELAY,
+ (unsigned int) IPTOS_THROUGHPUT,
+ (unsigned int) IPTOS_RELIABILITY,
+ (unsigned int) IPTOS_MINCOST);
+
+ exit (status);
+} /* }}} void usage_qos_exit */
+
+static int set_opt_send_qos (const char *opt) /* {{{ */
+{
+ if (opt == NULL)
+ return (EINVAL);
+
+ if (strcasecmp ("help", opt) == 0)
+ usage_qos_exit (/* arg = */ NULL, /* status = */ EXIT_SUCCESS);
+ /* DiffServ (RFC 2474): */
+ /* - Best effort (BE) */
+ else if (strcasecmp ("be", opt) == 0)
+ opt_send_qos = 0;
+ /* - Expedited Forwarding (EF, RFC 3246) */
+ else if (strcasecmp ("ef", opt) == 0)
+ opt_send_qos = 0xB8; /* == 0x2E << 2 */
+ /* - Voice Admit (VA, RFC 5865) */
+ else if (strcasecmp ("va", opt) == 0)
+ opt_send_qos = 0xB0; /* == 0x2D << 2 */
+ /* - Assured Forwarding (AF, RFC 2597) */
+ else if ((strncasecmp ("af", opt, strlen ("af")) == 0)
+ && (strlen (opt) == 4))
+ {
+ uint8_t dscp;
+ uint8_t class;
+ uint8_t prec;
+
+ /* There are four classes, AF1x, AF2x, AF3x, and AF4x. */
+ if (opt[2] == '1')
+ class = 1;
+ else if (opt[2] == '2')
+ class = 2;
+ else if (opt[2] == '3')
+ class = 3;
+ else if (opt[2] == '4')
+ class = 4;
+ else
+ usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_SUCCESS);
+
+ /* In each class, there are three precedences, AFx1, AFx2, and AFx3 */
+ if (opt[3] == '1')
+ prec = 1;
+ else if (opt[3] == '2')
+ prec = 2;
+ else if (opt[3] == '3')
+ prec = 3;
+ else
+ usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_SUCCESS);
+
+ dscp = (8 * class) + (2 * prec);
+ /* The lower two bits are used for Explicit Congestion Notification (ECN) */
+ opt_send_qos = dscp << 2;
+ }
+ /* - Class Selector (CS) */
+ else if ((strncasecmp ("cs", opt, strlen ("cs")) == 0)
+ && (strlen (opt) == 3))
+ {
+ uint8_t class;
+
+ if ((opt[2] < '0') || (opt[2] > '7'))
+ usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_FAILURE);
+
+ /* Not exactly legal by the C standard, but I don't know of any
+ * system not supporting this hack. */
+ class = ((uint8_t) opt[2]) - ((uint8_t) '0');
+ opt_send_qos = class << 5;
+ }
+ /* Type of Service (RFC 1349) */
+ else if (strcasecmp ("lowdelay", opt) == 0)
+ opt_send_qos = IPTOS_LOWDELAY;
+ else if (strcasecmp ("throughput", opt) == 0)
+ opt_send_qos = IPTOS_THROUGHPUT;
+ else if (strcasecmp ("reliability", opt) == 0)
+ opt_send_qos = IPTOS_RELIABILITY;
+ else if (strcasecmp ("mincost", opt) == 0)
+ opt_send_qos = IPTOS_MINCOST;
+ /* Numeric value */
+ else
+ {
+ unsigned long value;
+ char *endptr;
+
+ errno = 0;
+ endptr = NULL;
+ value = strtoul (opt, &endptr, /* base = */ 0);
+ if ((errno != 0) || (endptr == opt)
+ || (endptr == NULL) || (*endptr != 0)
+ || (value > 0xff))
+ usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_FAILURE);
+
+ opt_send_qos = (uint8_t) value;
+ }
+
+ return (0);
+} /* }}} int set_opt_send_qos */
+
+static char *format_qos (uint8_t qos, char *buffer, size_t buffer_size) /* {{{ */
+{
+ uint8_t dscp;
+ uint8_t ecn;
+ char *dscp_str;
+ char *ecn_str;
+
+ dscp = qos >> 2;
+ ecn = qos & 0x03;
+
+ switch (dscp)
+ {
+ case 0x00: dscp_str = "be"; break;
+ case 0x2e: dscp_str = "ef"; break;
+ case 0x2d: dscp_str = "va"; break;
+ case 0x0a: dscp_str = "af11"; break;
+ case 0x0c: dscp_str = "af12"; break;
+ case 0x0e: dscp_str = "af13"; break;
+ case 0x12: dscp_str = "af21"; break;
+ case 0x14: dscp_str = "af22"; break;
+ case 0x16: dscp_str = "af23"; break;
+ case 0x1a: dscp_str = "af31"; break;
+ case 0x1c: dscp_str = "af32"; break;
+ case 0x1e: dscp_str = "af33"; break;
+ case 0x22: dscp_str = "af41"; break;
+ case 0x24: dscp_str = "af42"; break;
+ case 0x26: dscp_str = "af43"; break;
+ case 0x08: dscp_str = "cs1"; break;
+ case 0x10: dscp_str = "cs2"; break;
+ case 0x18: dscp_str = "cs3"; break;
+ case 0x20: dscp_str = "cs4"; break;
+ case 0x28: dscp_str = "cs5"; break;
+ case 0x30: dscp_str = "cs6"; break;
+ case 0x38: dscp_str = "cs7"; break;
+ default: dscp_str = NULL;
+ }
+
+ switch (ecn)
+ {
+ case 0x01: ecn_str = ",ecn(1)"; break;
+ case 0x02: ecn_str = ",ecn(0)"; break;
+ case 0x03: ecn_str = ",ce"; break;
+ default: ecn_str = "";
+ }
+
+ if (dscp_str == NULL)
+ snprintf (buffer, buffer_size, "0x%02x%s", dscp, ecn_str);
+ else
+ snprintf (buffer, buffer_size, "%s%s", dscp_str, ecn_str);
+ buffer[buffer_size - 1] = 0;
+
+ return (buffer);
+} /* }}} char *format_qos */
+
+static int read_options (int argc, char **argv) /* {{{ */
{
int optchar;
while (1)
{
{
int optchar;
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:f:D:");
+ optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:");
if (optchar == -1)
break;
if (optchar == -1)
break;
break;
}
break;
}
+ case 'Q':
+ set_opt_send_qos (optarg);
+ break;
+
case 'h':
usage_exit (argv[0], 0);
break;
case 'h':
usage_exit (argv[0], 0);
break;
}
return (optind);
}
return (optind);
-}
+} /* }}} read_options */
+
+static void time_normalize (struct timespec *ts) /* {{{ */
+{
+ while (ts->tv_nsec < 0)
+ {
+ if (ts->tv_sec == 0)
+ {
+ ts->tv_nsec = 0;
+ return;
+ }
+
+ ts->tv_sec -= 1;
+ ts->tv_nsec += 1000000000;
+ }
+
+ while (ts->tv_nsec >= 1000000000)
+ {
+ ts->tv_sec += 1;
+ ts->tv_nsec -= 1000000000;
+ }
+} /* }}} void time_normalize */
+
+static void time_calc (struct timespec *ts_dest, /* {{{ */
+ const struct timespec *ts_int,
+ const struct timeval *tv_begin,
+ const struct timeval *tv_end)
+{
+ ts_dest->tv_sec = tv_begin->tv_sec + ts_int->tv_sec;
+ ts_dest->tv_nsec = (tv_begin->tv_usec * 1000) + ts_int->tv_nsec;
+ time_normalize (ts_dest);
+
+ /* Assure that `(begin + interval) > end'.
+ * This may seem overly complicated, but `tv_sec' is of type `time_t'
+ * which may be `unsigned. *sigh* */
+ if ((tv_end->tv_sec > ts_dest->tv_sec)
+ || ((tv_end->tv_sec == ts_dest->tv_sec)
+ && ((tv_end->tv_usec * 1000) > ts_dest->tv_nsec)))
+ {
+ ts_dest->tv_sec = 0;
+ ts_dest->tv_nsec = 0;
+ return;
+ }
+
+ ts_dest->tv_sec = ts_dest->tv_sec - tv_end->tv_sec;
+ ts_dest->tv_nsec = ts_dest->tv_nsec - (tv_end->tv_usec * 1000);
+ time_normalize (ts_dest);
+} /* }}} void time_calc */
+
+#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 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 void print_host (pingobj_iter_t *iter)
+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;
+
+ initscr ();
+ cbreak ();
+ noecho ();
+ 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);
+
+ 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);
+ }
+
+
+ /* 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);
+
+ printf ("PING %s (%s) %zu bytes of data.\n",
+ 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
+
+static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
+ int index)
{
double latency;
unsigned int sequence;
int recv_ttl;
{
double latency;
unsigned int sequence;
int recv_ttl;
+ uint8_t recv_qos;
+ char recv_qos_str[16];
size_t buffer_len;
size_t data_len;
ping_context_t *context;
size_t buffer_len;
size_t data_len;
ping_context_t *context;
ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
&recv_ttl, &buffer_len);
ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
&recv_ttl, &buffer_len);
+ recv_qos = 0;
+ buffer_len = sizeof (recv_qos);
+ ping_iterator_get_info (iter, PING_INFO_RECV_QOS,
+ &recv_qos, &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);
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_sent++;
if (latency > 0.0)
{
if ((context->latency_min < 0.0) || (context->latency_min > latency))
context->latency_min = latency;
if ((context->latency_min < 0.0) || (context->latency_min > latency))
context->latency_min = latency;
- printf ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i time=%.2f ms\n",
+#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 ",
+ data_len, context->host, context->addr,
+ sequence, recv_ttl,
+ format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
+ if ((recv_qos != 0) || (opt_send_qos != 0))
+ {
+ HOST_PRINTF ("qos=%s ",
+ format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
+ }
+ HOST_PRINTF ("time=");
+ 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 ",
data_len,
context->host, context->addr,
data_len,
context->host, context->addr,
- sequence, recv_ttl, latency);
+ sequence, recv_ttl);
+ if ((recv_qos != 0) || (opt_send_qos != 0))
+ {
+ HOST_PRINTF ("qos=%s ",
+ format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
+ }
+ HOST_PRINTF ("time=%.2f ms\n", latency);
+#if USE_NCURSES
+ }
+#endif
}
else
{
}
else
{
- printf ("echo reply from %s (%s): icmp_seq=%u timeout\n",
+#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);
context->host, context->addr,
sequence);
+#if USE_NCURSES
+ }
+#endif
}
}
-}
-static void time_normalize (struct timespec *ts)
+#if USE_NCURSES
+ update_stats_from_context (context);
+ wrefresh (main_win);
+#endif
+} /* }}} void update_host_hook */
+
+static int post_loop_hook (pingobj_t *ping) /* {{{ */
{
{
- while (ts->tv_nsec < 0)
- {
- if (ts->tv_sec == 0)
- {
- ts->tv_nsec = 0;
- return;
- }
+ pingobj_iter_t *iter;
- ts->tv_sec -= 1;
- ts->tv_nsec += 1000000000;
- }
+#if USE_NCURSES
+ endwin ();
+#endif
- while (ts->tv_nsec >= 1000000000)
+ for (iter = ping_iterator_get (ping);
+ iter != NULL;
+ iter = ping_iterator_next (iter))
{
{
- ts->tv_sec += 1;
- ts->tv_nsec -= 1000000000;
- }
-}
+ ping_context_t *context;
-static void time_calc (struct timespec *ts_dest,
- const struct timespec *ts_int,
- const struct timeval *tv_begin,
- const struct timeval *tv_end)
-{
- ts_dest->tv_sec = tv_begin->tv_sec + ts_int->tv_sec;
- ts_dest->tv_nsec = (tv_begin->tv_usec * 1000) + ts_int->tv_nsec;
- time_normalize (ts_dest);
+ context = ping_iterator_get_context (iter);
- /* Assure that `(begin + interval) > end'.
- * This may seem overly complicated, but `tv_sec' is of type `time_t'
- * which may be `unsigned. *sigh* */
- if ((tv_end->tv_sec > ts_dest->tv_sec)
- || ((tv_end->tv_sec == ts_dest->tv_sec)
- && ((tv_end->tv_usec * 1000) > ts_dest->tv_nsec)))
- {
- ts_dest->tv_sec = 0;
- ts_dest->tv_nsec = 0;
- return;
+ 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,
+ context_get_packet_loss (context),
+ context->latency_total);
+
+ if (context->req_rcvd != 0)
+ {
+ double average;
+ double deviation;
+
+ 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,
+ average,
+ context->latency_max,
+ deviation);
+ }
+
+ ping_iterator_set_context (iter, NULL);
+ context_destroy (context);
}
}
- ts_dest->tv_sec = ts_dest->tv_sec - tv_end->tv_sec;
- ts_dest->tv_nsec = ts_dest->tv_nsec - (tv_end->tv_usec * 1000);
- time_normalize (ts_dest);
-}
+ return (0);
+} /* }}} int post_loop_hook */
-int main (int argc, char **argv)
+int main (int argc, char **argv) /* {{{ */
{
pingobj_t *ping;
pingobj_iter_t *iter;
{
pingobj_t *ping;
pingobj_iter_t *iter;
int optind;
int i;
int optind;
int i;
+ int status;
+#if _POSIX_SAVED_IDS
+ uid_t saved_set_uid;
+
+ /* Save the old effective user id */
+ saved_set_uid = geteuid ();
+ /* Set the effective user ID to the real user ID without changing the
+ * saved set-user ID */
+ status = seteuid (getuid ());
+ if (status != 0)
+ {
+ fprintf (stderr, "Temporarily dropping privileges "
+ "failed: %s\n", strerror (errno));
+ exit (EXIT_FAILURE);
+ }
+#endif
optind = read_options (argc, argv);
optind = read_options (argc, argv);
- if ((optind >= argc) && (opt_filename == NULL)) {
- usage_exit (argv[0], 1);
+#if !_POSIX_SAVED_IDS
+ /* Cannot temporarily drop privileges -> reject every file but "-". */
+ if ((opt_filename != NULL)
+ && (strcmp ("-", opt_filename) != 0)
+ && (getuid () != geteuid ()))
+ {
+ fprintf (stderr, "Your real and effective user IDs don't "
+ "match. Reading from a file (option '-f')\n"
+ "is therefore too risky. You can still read "
+ "from STDIN using '-f -' if you like.\n"
+ "Sorry.\n");
+ exit (EXIT_FAILURE);
}
}
+#endif
- if (geteuid () != 0)
- {
- fprintf (stderr, "Need superuser privileges to open a RAW socket. Sorry.\n");
- return (1);
+ if ((optind >= argc) && (opt_filename == NULL)) {
+ usage_exit (argv[0], 1);
}
if ((ping = ping_construct ()) == NULL)
}
if ((ping = ping_construct ()) == NULL)
opt_send_ttl, ping_get_error (ping));
}
opt_send_ttl, ping_get_error (ping));
}
+ if (ping_setopt (ping, PING_OPT_QOS, &opt_send_qos) != 0)
+ {
+ fprintf (stderr, "Setting TOS to %i failed: %s\n",
+ opt_send_qos, ping_get_error (ping));
+ }
+
{
double temp_sec;
double temp_nsec;
{
double temp_sec;
double temp_nsec;
return (1);
}
return (1);
}
+#if _POSIX_SAVED_IDS
+ /* Regain privileges */
+ status = seteuid (saved_set_uid);
+ if (status != 0)
+ {
+ fprintf (stderr, "Temporarily re-gaining privileges "
+ "failed: %s\n", strerror (errno));
+ exit (EXIT_FAILURE);
+ }
+#endif
+
while (fgets(line, sizeof(line), infile))
{
/* Strip whitespace */
while (fgets(line, sizeof(line), infile))
{
/* Strip whitespace */
fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
continue;
}
fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
continue;
}
+ else
+ {
+ host_num++;
+ }
}
}
+#if _POSIX_SAVED_IDS
+ /* Drop privileges */
+ status = seteuid (getuid ());
+ if (status != 0)
+ {
+ fprintf (stderr, "Temporarily dropping privileges "
+ "failed: %s\n", strerror (errno));
+ exit (EXIT_FAILURE);
+ }
+#endif
+
fclose(infile);
}
fclose(infile);
}
+#if _POSIX_SAVED_IDS
+ /* Regain privileges */
+ status = seteuid (saved_set_uid);
+ if (status != 0)
+ {
+ fprintf (stderr, "Temporarily re-gaining privileges "
+ "failed: %s\n", strerror (errno));
+ exit (EXIT_FAILURE);
+ }
+#endif
+
for (i = optind; i < argc; i++)
{
if (ping_host_add (ping, argv[i]) < 0)
for (i = optind; i < argc; i++)
{
if (ping_host_add (ping, argv[i]) < 0)
fprintf (stderr, "Adding host `%s' failed: %s\n", argv[i], errmsg);
continue;
}
fprintf (stderr, "Adding host `%s' failed: %s\n", argv[i], errmsg);
continue;
}
+ else
+ {
+ host_num++;
+ }
}
}
- /* Drop root privileges if we're setuid-root. */
- setuid (getuid ());
-
- i = 0;
- for (iter = ping_iterator_get (ping);
- iter != NULL;
- iter = ping_iterator_next (iter))
+ /* Permanently drop root privileges if we're setuid-root. */
+ status = setuid (getuid ());
+ if (status != 0)
{
{
- ping_context_t *context;
- size_t buffer_size;
-
- context = context_create ();
-
- 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);
-
- buffer_size = 0;
- ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size);
-
- printf ("PING %s (%s) %zu bytes of data.\n",
- context->host, context->addr, buffer_size);
+ fprintf (stderr, "Dropping privileges failed: %s\n",
+ strerror (errno));
+ exit (EXIT_FAILURE);
+ }
- ping_iterator_set_context (iter, (void *) context);
+#if _POSIX_SAVED_IDS
+ saved_set_uid = (uid_t) -1;
+#endif
- i++;
- }
+ ping_initialize_contexts (ping);
if (i == 0)
return (1);
if (i == 0)
return (1);
return (1);
}
return (1);
}
+ pre_loop_hook (ping);
+
while (opt_count != 0)
{
while (opt_count != 0)
{
+ int index;
int status;
if (gettimeofday (&tv_begin, NULL) < 0)
int status;
if (gettimeofday (&tv_begin, NULL) < 0)
return (1);
}
return (1);
}
+ index = 0;
for (iter = ping_iterator_get (ping);
iter != NULL;
iter = ping_iterator_next (iter))
{
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)
/* 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) */
if (opt_count > 0)
opt_count--;
} /* while (opt_count != 0) */
- for (iter = ping_iterator_get (ping);
- iter != NULL;
- iter = ping_iterator_next (iter))
- {
- ping_context_t *context;
-
- context = ping_iterator_get_context (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->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)));
-
- printf ("rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n",
- context->latency_min,
- average,
- context->latency_max,
- deviation);
- }
-
- ping_iterator_set_context (iter, NULL);
- context_destroy (context);
- }
+ post_loop_hook (ping);
ping_destroy (ping);
return (0);
ping_destroy (ping);
return (0);
-}
+} /* }}} int main */
+
+/* vim: set fdm=marker : */