X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=528c90d1e25930077472719056ed6a8112ab3ad3;hb=c56d49bb736fb69d95287b094e048851c0ec8419;hp=a74cd420a8e5567a5907d6faca5db76e4ff4067c;hpb=a18b31772ddeab5d911f5cc8b7eecb340fabe879;p=liboping.git diff --git a/src/oping.c b/src/oping.c index a74cd42..528c90d 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-2014 Florian octo Forster + * Copyright (C) 2006-2016 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 @@ -82,11 +82,17 @@ /* 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 +#if defined HAVE_NCURSESW_CURSES_H +# include +#elif defined HAVE_NCURSESW_H +# include +#elif defined HAVE_NCURSES_CURSES_H +# include +#elif defined HAVE_NCURSES_H # include -# endif +#else +# error "SysV or X/Open-compatible Curses header file required" +#endif # define OPING_GREEN 1 # define OPING_YELLOW 2 @@ -172,7 +178,7 @@ typedef struct ping_context * and HISTORY_SIZE_MAX. */ size_t history_size; - /* Number "received" entries in the history, i.e. non-NAN entries. */ + /* Total number of reponses received. */ size_t history_received; /* Index of the next RTT to be written to history_by_time. This wraps @@ -192,9 +198,11 @@ typedef struct ping_context } ping_context_t; static double opt_interval = 1.0; +static double opt_timeout = PING_DEF_TIMEOUT; static int opt_addrfamily = PING_DEF_AF; static char *opt_srcaddr = NULL; static char *opt_device = NULL; +static char *opt_mark = NULL; static char *opt_filename = NULL; static int opt_count = -1; static int opt_send_ttl = 64; @@ -206,8 +214,11 @@ static double opt_exit_status_threshold = 1.0; static int opt_show_graph = 1; static int opt_utf8 = 0; #endif +static char *opt_outfile = NULL; +static int opt_bell = 0; -static int host_num = 0; +static int host_num = 0; +static FILE *outfile = NULL; #if USE_NCURSES static WINDOW *main_win = NULL; @@ -221,22 +232,17 @@ static void sigint_handler (int signal) /* {{{ */ opt_count = 0; } /* }}} void sigint_handler */ -static ping_context_t *context_create (void) /* {{{ */ +static ping_context_t *context_create () /* {{{ */ { - ping_context_t *ret; - - if ((ret = malloc (sizeof (ping_context_t))) == NULL) + ping_context_t *ctx = calloc (1, sizeof (*ctx)); + if (ctx == NULL) return (NULL); - memset (ret, '\0', sizeof (ping_context_t)); - - ret->latency_total = 0.0; - #if USE_NCURSES - ret->window = NULL; + ctx->window = NULL; #endif - return (ret); + return (ctx); } /* }}} ping_context_t *context_create */ static void context_destroy (ping_context_t *context) /* {{{ */ @@ -430,12 +436,15 @@ static void usage_exit (const char *name, int status) /* {{{ */ " -4|-6 force the use of IPv4 or IPv6\n" " -c count number of ICMP packets to send\n" " -i interval interval with which to send ICMP packets\n" + " -w timeout time to wait for replies, in seconds\n" " -t ttl time to live for each ICMP packet\n" " -Q qos Quality of Service (QoS) of outgoing packets\n" " Use \"-Q help\" for a list of valid options.\n" " -I srcaddr source address\n" " -D device outgoing interface name\n" - " -f filename filename to read hosts from\n" + " -m mark mark to set on outgoing packets\n" + " -f filename read hosts from \n" + " -O filename write RTT measurements to \n" #if USE_NCURSES " -u / -U force / disable UTF-8 output\n" " -g graph graph type to draw\n" @@ -444,8 +453,8 @@ static void usage_exit (const char *name, int status) /* {{{ */ " -Z percent Exit with non-zero exit status if more than this percentage of\n" " probes timed out. (default: never)\n" - "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n" - "by Florian octo Forster \n" + "\noping "PACKAGE_VERSION", http://noping.cc/\n" + "by Florian octo Forster \n" "for contributions see `AUTHORS'\n", name); exit (status); @@ -645,7 +654,7 @@ static int read_options (int argc, char **argv) /* {{{ */ while (1) { - optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:" + optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b" #if USE_NCURSES "uUg:" #endif @@ -698,6 +707,18 @@ static int read_options (int argc, char **argv) /* {{{ */ } break; + case 'w': + { + char *endp = NULL; + double t = strtod (optarg, &endp); + if ((optarg[0] != 0) && (endp != NULL) && (*endp == 0)) + opt_timeout = t; + else + fprintf (stderr, "Ignoring invalid timeout: %s\n", + optarg); + } + break; + case 'I': { if (opt_srcaddr != NULL) @@ -710,6 +731,10 @@ static int read_options (int argc, char **argv) /* {{{ */ opt_device = optarg; break; + case 'm': + opt_mark = optarg; + break; + case 't': { int new_send_ttl; @@ -726,6 +751,13 @@ static int read_options (int argc, char **argv) /* {{{ */ set_opt_send_qos (optarg); break; + case 'O': + { + free (opt_outfile); + opt_outfile = strdup (optarg); + } + break; + case 'P': { double new_percentile; @@ -761,6 +793,9 @@ static int read_options (int argc, char **argv) /* {{{ */ opt_utf8 = 1; break; #endif + case 'b': + opt_bell = 1; + break; case 'Z': { @@ -979,12 +1014,19 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ /* Determine the first index in the history we need to draw * the graph. */ history_offset = 0; - if (((size_t) x_max) < ctx->history_size) + if (((size_t) x_max) < ctx->history_size) /* window is smaller than history */ { if (ctx->history_index > x_max) history_offset = ctx->history_index - x_max; else /* wrap around */ - history_offset = ctx->history_index + x_max - ctx->history_size; + history_offset = ctx->history_index + ctx->history_size - x_max; + } + else /* window is larger than history */ + { + if (ctx->history_index != ctx->history_size) /* no longer growing. */ + history_offset = ctx->history_index; + else /* start-up */ + history_offset = 0; } for (x = 0; x < x_max; x++) @@ -1212,7 +1254,7 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) percentile = percentile_to_latency (ctx, opt_percentile); mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2, - "RTT[ms]: min = %.0f, median = %.0f, p(%.0f) = %.0f, max = %.0f", + "RTT[ms]: min = %.0f, median = %.0f, p(%.0f) = %.0f, max = %.0f ", min, median, opt_percentile, percentile, max); } @@ -1319,10 +1361,11 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */ if (has_colors () == TRUE) { start_color (); - 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); + use_default_colors (); + init_pair (OPING_GREEN, COLOR_GREEN, /* default = */ -1); + init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ -1); + init_pair (OPING_RED, COLOR_RED, /* default = */ -1); + init_pair (OPING_GREEN_HIST, COLOR_GREEN, -1); init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN); init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW); } @@ -1539,6 +1582,13 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ #if USE_NCURSES } #endif + if (opt_bell) { +#if USE_NCURSES + beep(); +#else + HOST_PRINTF ("\a"); +#endif + } } else /* if (!(latency > 0.0)) */ { @@ -1564,6 +1614,20 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ #endif } + if (outfile != NULL) + { + struct timeval tv = {0}; + if (gettimeofday (&tv, NULL) == 0) + { + double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.0); + + if ((sequence % 32) == 0) + fprintf (outfile, "#time,host,latency[ms]\n"); + + fprintf (outfile, "%.3f,\"%s\",%.2f\n", t, context->host, latency); + } + } + #if USE_NCURSES update_stats_from_context (context, iter); wrefresh (main_win); @@ -1657,7 +1721,7 @@ int main (int argc, char **argv) /* {{{ */ } #endif - setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); optind = read_options (argc, argv); #if !_POSIX_SAVED_IDS @@ -1708,6 +1772,12 @@ int main (int argc, char **argv) /* {{{ */ /* printf ("ts_int = %i.%09li\n", (int) ts_int.tv_sec, ts_int.tv_nsec); */ } + if (ping_setopt (ping, PING_OPT_TIMEOUT, (void*)(&opt_timeout)) != 0) + { + fprintf (stderr, "Setting timeout failed: %s\n", + ping_get_error (ping)); + } + if (opt_addrfamily != PING_DEF_AF) ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily); @@ -1729,6 +1799,24 @@ int main (int argc, char **argv) /* {{{ */ } } + if (opt_mark != NULL) + { + char *endp = NULL; + int mark = (int) strtol (opt_mark, &endp, /* base = */ 0); + if ((opt_mark[0] != 0) && (endp != NULL) && (*endp == 0)) + { + if (ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0) + { + fprintf (stderr, "Setting mark failed: %s\n", + ping_get_error (ping)); + } + } + else + { + fprintf(stderr, "Ignoring invalid mark: %s\n", optarg); + } + } + if (opt_filename != NULL) { FILE *infile; @@ -1839,6 +1927,17 @@ int main (int argc, char **argv) /* {{{ */ saved_set_uid = (uid_t) -1; #endif + if (opt_outfile != NULL) + { + outfile = fopen (opt_outfile, "a"); + if (outfile == NULL) + { + fprintf (stderr, "opening \"%s\" failed: %s\n", + opt_outfile, strerror (errno)); + exit (EXIT_FAILURE); + } + } + ping_initialize_contexts (ping); if (i == 0) @@ -1925,6 +2024,12 @@ int main (int argc, char **argv) /* {{{ */ ping_destroy (ping); + if (outfile != NULL) + { + fclose (outfile); + outfile = NULL; + } + if (status == 0) exit (EXIT_SUCCESS); else