X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=a630b8d1f867f8fde83a38fdb92e9b482762d949;hb=3885683edb804a976b89b95d8e5adf041e8912d7;hp=d84219eadad61d1b18f8a0bb392000c61d70d559;hpb=66464b61f8ee756dcfc0081944f4367da2b1a6ab;p=liboping.git diff --git a/src/oping.c b/src/oping.c index d84219e..a630b8d 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,21 +74,35 @@ #include #endif +#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 +# include # 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 #endif #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]; @@ -247,10 +261,6 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */ 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" @@ -272,6 +282,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) @@ -284,6 +295,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" @@ -323,13 +336,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') @@ -414,6 +430,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; @@ -589,12 +606,26 @@ 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 int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) /* {{{ */ { + double latency = -1.0; + size_t buffer_len = sizeof (latency); + int maxx; + getmaxyx(ctx->window, maxx, maxx); + + 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); @@ -624,6 +655,53 @@ static int update_stats_from_context (ping_context_t *ctx) /* {{{ */ deviation); } + if (latency > 0.0) + { + if (has_colors () == TRUE) + { + int color = OPING_GREEN_HIST; + float ratio = 0; + int index = 0; + + ratio = latency / PING_DEF_TTL; + if (ratio > 1) { + ratio = 1; + } + if (ratio > 2/3.0) { + color = OPING_RED_HIST; + } + else if (ratio > 1/3.0) { + color = OPING_YELLOW_HIST; + } + 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 = 0; /* safety check */ + } + if (index >= BARS_LEN) { + index = BARS_LEN -1; /* safety check */ + } + wattron (ctx->window, COLOR_PAIR(color)); + mvwprintw (ctx->window, + /* y = */ 3, + /* x = */ (1 + sequence) % maxx, + 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) % maxx, + "!"); + wattroff (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD); + } wrefresh (ctx->window); return (0); @@ -640,7 +718,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); @@ -664,9 +742,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); } @@ -714,11 +792,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); @@ -743,9 +824,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); } @@ -812,7 +893,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; @@ -938,7 +1019,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 */ @@ -1018,6 +1099,7 @@ int main (int argc, char **argv) /* {{{ */ } #endif + setlocale(LC_ALL, ""); optind = read_options (argc, argv); #if !_POSIX_SAVED_IDS