![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/oping.c b/src/oping.c
index 84d97afdb7206fbded38f47fa898769519fecbad..f55f1e5f23f08a564d235b1d8f985006aaed3279 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
/**
* 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
#include "oping.h"
+const char *bars[BARS_LEN] = { "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
+
#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];
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')
@@ -414,6 +427,7 @@ static char *format_qos (uint8_t qos, char *buffer, size_t buffer_size) /* {{{ *
{
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_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 = context_get_stddev (ctx);
mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
- "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
+ "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n",
ctx->latency_min,
average,
ctx->latency_max,
deviation);
}
+ if (latency > 0.0)
+ {
+ if (has_colors () == TRUE)
+ {
+ int color = OPING_GREEN;
+ float ratio = 0;
+ int index = 0;
+
+ ratio = latency / PING_DEF_TTL;
+ if (ratio > 2/3.0) {
+ color = OPING_RED;
+ }
+ else if (ratio > 1/3.0) {
+ color = OPING_YELLOW;
+ }
+ index = (int) (ratio * BARS_LEN * 3); /* 3 colors */
+ /* HOST_PRINTF ("%%r%f-ia%d-", ratio, index); */
+ index = index % (BARS_LEN-1);
+ /* HOST_PRINTF ("im%d-", index); */
+ if (index < 0 || index >= BARS_LEN) {
+ index = 0; /* safety check */
+ }
+ wattron (ctx->window, COLOR_PAIR(color));
+ mvwprintw (ctx->window,
+ /* y = */ 3, /* x = */ 1 + sequence,
+ bars[index]);
+ wattroff (ctx->window, COLOR_PAIR(color));
+ }
+ else
+ {
+ }
+ }
+ else {
+ wattron (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD);
+ mvwprintw (ctx->window,
+ /* y = */ 3, /* x = */ 1 + sequence,
+ "!");
+ wattroff (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD);
+ }
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_RED, COLOR_RED, /* default = */ 0);
}
- 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 (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 qos=%s"
- " time=",
- data_len, context->host, context->addr,
- sequence, recv_ttl,
- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
- wattron (main_win, COLOR_PAIR(color));
- HOST_PRINTF ("%.2f", latency);
+ float ratio = 0;
+ int index = 0;
+
+ ratio = latency / PING_DEF_TTL;
+ if (ratio > 2/3.0) {
+ color = OPING_RED;
+ }
+ else if (ratio > 1/3.0) {
+ color = OPING_YELLOW;
+ }
+ index = (int) (ratio * BARS_LEN * 3); /* 3 colors */
+ /* HOST_PRINTF ("%%r%f-ia%d-", ratio, index); */
+ index = index % (BARS_LEN-1);
+ /* HOST_PRINTF ("im%d-", index); */
+ if (index < 0 || index >= BARS_LEN) {
+ index = 0; /* safety check */
+ }
+ wattron (main_win, COLOR_PAIR(color));
+ HOST_PRINTF (bars[index]);
wattroff (main_win, COLOR_PAIR(color));
- HOST_PRINTF (" ms\n");
}
else
{
#endif
- HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i qos=%s"
- " time=%.2f ms\n",
+ 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)),
- 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
#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");
+ HOST_PRINTF ("!");
wattroff (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
- HOST_PRINTF ("\n");
}
else
{
}
#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