X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=4a605534e7e608694d475443ca615328c42b5156;hb=94a8bf0d6c869b1e6bde637dd25666d2f4cb7052;hp=5b13a1ffe3269424e02ecd72fd23b6c7b4d60ae5;hpb=4b7074ad0d82ced50c9bade2ccbf97189f4e65c1;p=liboping.git diff --git a/src/oping.c b/src/oping.c index 5b13a1f..4a60553 100644 --- a/src/oping.c +++ b/src/oping.c @@ -1,6 +1,6 @@ /** * Object oriented C module to send ICMP and ICMPv6 `echo's. - * Copyright (C) 2006-2010 Florian octo Forster + * Copyright (C) 2006-2011 Florian octo Forster * * 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 @@ -74,13 +74,52 @@ #include #endif +#include +#include + #if USE_NCURSES # define NCURSES_OPAQUE 1 -# include +/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */ +# define _X_OPEN_SOURCE_EXTENDED + +# if HAVE_NCURSESW_NCURSES_H +# include +# elif HAVE_NCURSES_H +# include +# endif # 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_utf8[] = { + "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" }; +static size_t const hist_symbols_utf8_num = sizeof (hist_symbols_utf8) + / sizeof (hist_symbols_utf8[0]); + +/* scancodes for 6 levels of horizontal bars, ncurses-specific */ +/* those are not the usual constants because those are not constant */ +static int const hist_symbols_acs[] = { + 115, /* ACS_S9 "⎽" */ + 114, /* ACS_S7 "⎼" */ + 113, /* ACS_S5 "─" */ + 112, /* ACS_S3 "⎻" */ + 111 /* ACS_S1 "⎺" */ +}; +static size_t const hist_symbols_acs_num = sizeof (hist_symbols_acs) + / sizeof (hist_symbols_acs[0]); + +/* use different colors without a background for scancodes */ +static int const hist_colors_utf8[] = { + OPING_GREEN_HIST, OPING_YELLOW_HIST, OPING_RED_HIST }; +static int const hist_colors_acs[] = { + OPING_GREEN, OPING_YELLOW, OPING_RED }; +/* assuming that both arrays are the same size */ +static size_t const hist_colors_num = sizeof (hist_colors_utf8) + / sizeof (hist_colors_utf8[0]); #endif #include "oping.h" @@ -89,6 +128,11 @@ # 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]; @@ -116,6 +160,9 @@ static char *opt_filename = NULL; static int opt_count = -1; static int opt_send_ttl = 64; static uint8_t opt_send_qos = 0; +#if USE_NCURSES +static int opt_utf8 = 0; +#endif static int host_num = 0; @@ -260,6 +307,9 @@ static void usage_exit (const char *name, int status) /* {{{ */ " -I srcaddr source address\n" " -D device outgoing interface name\n" " -f filename filename to read hosts from\n" +#if USE_NCURSES + " -u / -U force / disable UTF-8 output\n" +#endif "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n" "by Florian octo Forster \n" @@ -268,6 +318,7 @@ static void usage_exit (const char *name, int status) /* {{{ */ exit (status); } /* }}} void usage_exit */ +__attribute__((noreturn)) static void usage_qos_exit (const char *arg, int status) /* {{{ */ { if (arg != 0) @@ -280,6 +331,8 @@ static void usage_qos_exit (const char *arg, int status) /* {{{ */ " 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" @@ -319,13 +372,16 @@ static int set_opt_send_qos (const char *opt) /* {{{ */ /* - 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') @@ -410,6 +466,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; @@ -455,7 +512,11 @@ static int read_options (int argc, char **argv) /* {{{ */ while (1) { - optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:"); + optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:" +#if USE_NCURSES + "uU" +#endif + ); if (optchar == -1) break; @@ -526,6 +587,15 @@ static int read_options (int argc, char **argv) /* {{{ */ set_opt_send_qos (optarg); break; +#if USE_NCURSES + case 'u': + opt_utf8 = 2; + break; + case 'U': + opt_utf8 = 1; + break; +#endif + case 'h': usage_exit (argv[0], 0); break; @@ -585,12 +655,120 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */ } /* }}} void time_calc */ #if USE_NCURSES -static int update_stats_from_context (ping_context_t *ctx) /* {{{ */ +static _Bool has_utf8() /* {{{ */ +{ +# if HAVE_NCURSESW_NCURSES_H + if (!opt_utf8) + { + /* Automatically determine */ + if (strcasecmp ("UTF-8", nl_langinfo (CODESET)) == 0) + opt_utf8 = 2; + else + opt_utf8 = 1; + } + return ((_Bool) (opt_utf8 - 1)); +# else + return (0); +# endif +} /* }}} _Bool has_utf8 */ + +static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ + double latency, unsigned int sequence) { + int color = OPING_RED; + char const *symbol = "!"; + int symbolc = '!'; + size_t hist_symbols_num; + size_t index_symbols; + + int x_max; + int x_pos; + + x_max = getmaxx (ctx->window); + x_pos = ((sequence - 1) % (x_max - 4)) + 2; + + if (has_utf8()) + { + hist_symbols_num = hist_symbols_utf8_num; + } + else { + hist_symbols_num = hist_symbols_acs_num; + } + + if (latency >= 0.0) + { + double ratio; + size_t intensity; + size_t index_colors; + + 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); + + index_symbols = intensity % hist_symbols_num; + if (has_utf8()) + { + color = hist_colors_utf8[index_colors]; + symbol = hist_symbols_utf8[index_symbols]; + } + else + { + color = hist_colors_acs[index_colors]; + symbolc = hist_symbols_acs[index_symbols] | A_ALTCHARSET; + } + } + else /* if (!(latency >= 0.0)) */ + wattron (ctx->window, A_BOLD); + + wattron (ctx->window, COLOR_PAIR(color)); + if (has_utf8()) + { + mvwprintw (ctx->window, + /* y = */ 3, + /* x = */ x_pos, + symbol); + } + else { + mvwaddch (ctx->window, + /* y = */ 3, + /* x = */ x_pos, + symbolc); + } + 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); @@ -620,6 +798,9 @@ static int update_stats_from_context (ping_context_t *ctx) /* {{{ */ deviation); } + if (has_colors () == TRUE) + update_prettyping_graph (ctx, latency, sequence); + wrefresh (ctx->window); return (0); @@ -636,7 +817,7 @@ static int on_resize (pingobj_t *ping) /* {{{ */ 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); @@ -660,9 +841,9 @@ static int on_resize (pingobj_t *ping) /* {{{ */ 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); } @@ -710,11 +891,14 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */ 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); @@ -739,9 +923,9 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */ 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); } @@ -808,7 +992,7 @@ static int post_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */ #endif static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ - int index) + __attribute__((unused)) int index) { double latency; unsigned int sequence; @@ -934,7 +1118,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ } #if USE_NCURSES - update_stats_from_context (context); + update_stats_from_context (context, iter); wrefresh (main_win); #endif } /* }}} void update_host_hook */ @@ -1014,6 +1198,7 @@ int main (int argc, char **argv) /* {{{ */ } #endif + setlocale(LC_ALL, ""); optind = read_options (argc, argv); #if !_POSIX_SAVED_IDS