/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2010 Florian octo Forster <octo at verplant.org>
+ * Copyright (C) 2006-2011 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
#include <sys/types.h>
#endif
+#include <locale.h>
+
#if USE_NCURSES
# define NCURSES_OPAQUE 1
-# include <ncurses.h>
+/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
+# define _X_OPEN_SOURCE_EXTENDED
+# include <ncursesw/ncurses.h>
# define OPING_GREEN 1
# define OPING_YELLOW 2
# define OPING_RED 3
+# define OPING_GREEN_HIST 4
+# define OPING_YELLOW_HIST 5
+# define OPING_RED_HIST 6
+
+static char const * const hist_symbols[] = {
+ "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
+static size_t const hist_symbols_num = sizeof (hist_symbols)
+ / sizeof (hist_symbols[0]);
+
+static int const hist_colors[] = {
+ OPING_GREEN_HIST, OPING_YELLOW_HIST, OPING_RED_HIST };
+static size_t const hist_colors_num = sizeof (hist_colors)
+ / sizeof (hist_colors[0]);
#endif
#include "oping.h"
# 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];
static void usage_exit (const char *name, int status) /* {{{ */
{
- int name_length;
-
- name_length = (int) strlen (name);
-
fprintf (stderr, "Usage: %s [OPTIONS] "
"-f filename | host [host [host ...]]\n"
exit (status);
} /* }}} void usage_exit */
+__attribute__((noreturn))
static void usage_qos_exit (const char *arg, int status) /* {{{ */
{
if (arg != 0)
" 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"
/* - 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;
+ uint8_t class = 0;
+ uint8_t prec = 0;
/* There are four classes, AF1x, AF2x, AF3x, and AF4x. */
if (opt[2] == '1')
{
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;
} /* }}} void time_calc */
#if USE_NCURSES
-static int update_stats_from_context (ping_context_t *ctx) /* {{{ */
+static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */
+ double latency, unsigned int sequence)
+{
+ int color = OPING_RED;
+ char const *symbol = "!";
+
+ int x_max;
+ int x_pos;
+
+ x_max = getmaxx (ctx->window);
+ x_pos = ((sequence - 1) % (x_max - 4)) + 2;
+
+ if (latency >= 0.0)
+ {
+ double ratio;
+ size_t intensity;
+ size_t index_colors;
+ size_t index_symbols;
+
+ ratio = latency / PING_DEF_TTL;
+ if (ratio > 1) {
+ ratio = 1.0;
+ }
+
+ intensity = (size_t) ((ratio * hist_symbols_num
+ * hist_colors_num) - 1);
+
+ index_colors = intensity / hist_symbols_num;
+ assert (index_colors < hist_colors_num);
+ color = hist_colors[index_colors];
+
+ index_symbols = intensity % hist_symbols_num;
+ symbol = hist_symbols[index_symbols];
+ }
+ else /* if (!(latency >= 0.0)) */
+ wattron (ctx->window, A_BOLD);
+
+ wattron (ctx->window, COLOR_PAIR(color));
+ mvwprintw (ctx->window,
+ /* y = */ 3,
+ /* x = */ x_pos,
+ symbol);
+ wattroff (ctx->window, COLOR_PAIR(color));
+
+ /* Use negation here to handle NaN correctly. */
+ if (!(latency >= 0.0))
+ wattroff (ctx->window, A_BOLD);
+
+ wprintw (ctx->window, " ");
+ return (0);
+} /* }}} int update_prettyping_graph */
+
+static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) /* {{{ */
{
+ double latency = -1.0;
+ size_t buffer_len = sizeof (latency);
+
+ 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);
- werase (ctx->window);
+ /* werase (ctx->window); */
box (ctx->window, 0, 0);
wattron (ctx->window, A_BOLD);
deviation);
}
+ if (has_colors () == TRUE)
+ update_prettyping_graph (ctx, latency, sequence);
+
wrefresh (ctx->window);
return (0);
if ((height < 1) || (width < 1))
return (EINVAL);
- main_win_height = height - (4 * host_num);
+ main_win_height = height - (5 * host_num);
wresize (main_win, main_win_height, /* width = */ width);
/* Allow scrolling */
scrollok (main_win, TRUE);
delwin (context->window);
context->window = NULL;
}
- context->window = newwin (/* height = */ 4,
- /* width = */ 0,
- /* y = */ main_win_height + (4 * context->index),
+ context->window = newwin (/* height = */ 5,
+ /* width = */ width,
+ /* y = */ main_win_height + (5 * context->index),
/* x = */ 0);
}
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);
+ init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
+ init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW);
}
- main_win_height = height - (4 * host_num);
+ main_win_height = height - (5 * host_num);
main_win = newwin (/* height = */ main_win_height,
- /* width = */ 0,
+ /* width = */ width,
/* y = */ 0, /* x = */ 0);
/* Allow scrolling */
scrollok (main_win, TRUE);
delwin (context->window);
context->window = NULL;
}
- context->window = newwin (/* height = */ 4,
- /* width = */ 0,
- /* y = */ main_win_height + (4 * context->index),
+ context->window = newwin (/* height = */ 5,
+ /* width = */ width,
+ /* y = */ main_win_height + (5 * context->index),
/* x = */ 0);
}
#endif
static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
- int index)
+ __attribute__((unused)) int index)
{
double latency;
unsigned int sequence;
}
#if USE_NCURSES
- update_stats_from_context (context);
+ update_stats_from_context (context, iter);
wrefresh (main_win);
#endif
} /* }}} void update_host_hook */
}
#endif
+ setlocale(LC_ALL, "");
optind = read_options (argc, argv);
#if !_POSIX_SAVED_IDS