diff --git a/src/oping.c b/src/oping.c
index 84d97afdb7206fbded38f47fa898769519fecbad..79d7569db279b8a1d04eeb8b2ced4e3669179188 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
# 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 +421,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;
context->window = NULL;
}
context->window = newwin (/* height = */ 4,
- /* width = */ 0,
+ /* width = */ width,
/* y = */ main_win_height + (4 * context->index),
/* x = */ 0);
}
main_win_height = height - (4 * host_num);
main_win = newwin (/* height = */ main_win_height,
- /* width = */ 0,
+ /* width = */ width,
/* y = */ 0, /* x = */ 0);
/* Allow scrolling */
scrollok (main_win, TRUE);
context->window = NULL;
}
context->window = newwin (/* height = */ 4,
- /* width = */ 0,
+ /* width = */ width,
/* y = */ main_win_height + (4 * 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;
|| (latency > (average + stddev)))
color = OPING_YELLOW;
- HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i qos=%s"
- " time=",
+ 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));
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