X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foping.c;h=e2252a2d81ddfd76f1659ba72f2a1774509917e1;hb=fd1715441f92d3607749c37e01d1fcafe78e7d9b;hp=08423eac3887118443b83e87e347284d54ac405b;hpb=9f4c3107df0c18f18e0deab19b78f59e4e4d2b9c;p=liboping.git diff --git a/src/oping.c b/src/oping.c index 08423ea..e2252a2 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 @@ -196,6 +196,7 @@ 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; @@ -207,8 +208,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; @@ -289,6 +293,11 @@ static void clean_history (ping_context_t *ctx) /* {{{ */ memcpy (ctx->history_by_value, ctx->history_by_time, sizeof (ctx->history_by_time)); + /* Remove impossible values caused by adding a new host */ + for (i = 0; i < ctx->history_size; i++) + if (ctx->history_by_value[i] < 0) + ctx->history_by_value[i]=NAN; + /* Sort all RTTs. */ qsort (ctx->history_by_value, ctx->history_size, sizeof (ctx->history_by_value[0]), compare_double); @@ -393,6 +402,7 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */ { pingobj_iter_t *iter; int index; + size_t history_size = 0; if (ping == NULL) return (EINVAL); @@ -405,9 +415,25 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */ ping_context_t *context; size_t buffer_size; + context = ping_iterator_get_context(iter); + + /* if this is a previously existing host, do not recreate it */ + if (context != NULL) { + history_size = context->history_size; + context->index = index++; + continue; + } + context = context_create (); context->index = index; + /* start new hosts at the same graph point as old hosts */ + context->history_size = history_size; + context->history_index = history_size; + for (int i = 0; i < history_size; i++) { + context->history_by_time[i] = -1; + } + buffer_size = sizeof (context->host); ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size); @@ -437,7 +463,9 @@ static void usage_exit (const char *name, int status) /* {{{ */ " 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" @@ -647,7 +675,7 @@ static int read_options (int argc, char **argv) /* {{{ */ while (1) { - optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:w:" + optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b" #if USE_NCURSES "uUg:" #endif @@ -701,20 +729,16 @@ static int read_options (int argc, char **argv) /* {{{ */ break; case 'w': - { - char *endp; - double t = strtod(optarg, &endp); - if(optarg[0] != '\0' && *endp == '\0') { - opt_timeout = t; - } - else{ - fprintf (stderr, "Ignoring invalid timeout: %s\n", - optarg); + 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': { @@ -728,6 +752,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; @@ -744,6 +772,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; @@ -779,6 +814,9 @@ static int read_options (int argc, char **argv) /* {{{ */ opt_utf8 = 1; break; #endif + case 'b': + opt_bell = 1; + break; case 'Z': { @@ -983,7 +1021,7 @@ static int update_graph_boxplot (ping_context_t *ctx) /* {{{ */ } /* }}} int update_graph_boxplot */ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ - double latency, unsigned int sequence) + double latency) { size_t x; size_t x_max; @@ -1030,6 +1068,10 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ index = (history_offset + x) % ctx->history_size; latency = ctx->history_by_time[index]; + if (latency < 0) { + continue; + } + if (latency >= 0.0) { double ratio; @@ -1201,12 +1243,6 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) 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); @@ -1242,7 +1278,7 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) } if (opt_show_graph == 1) - update_graph_prettyping (ctx, latency, sequence); + update_graph_prettyping (ctx, latency); else if (opt_show_graph == 2) update_graph_histogram (ctx); else if (opt_show_graph == 3) @@ -1316,6 +1352,31 @@ static int check_resize (pingobj_t *ping) /* {{{ */ else if (opt_show_graph > 0) opt_show_graph++; } + else if (key == 'a') + { + char host[80]; + + wprintw(main_win, "New Host: "); + echo(); + wgetnstr(main_win, host, sizeof(host)); + noecho(); + + if (ping_host_add(ping, host) < 0) + { + const char *errmsg = ping_get_error (ping); + + wprintw (main_win, "Adding host `%s' failed: %s\n", host, errmsg); + } + else + { + /* FIXME - scroll main_win correctly so that + old data is still visible */ + + need_resize = 1; + host_num++; + ping_initialize_contexts(ping); + } + } } if (need_resize) @@ -1564,6 +1625,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)) */ { @@ -1589,6 +1657,21 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ #endif } + if (outfile != NULL) + { + struct timespec ts = { 0, 0 }; + + if (clock_gettime (CLOCK_REALTIME, &ts) == 0) + { + double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.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); @@ -1682,7 +1765,7 @@ int main (int argc, char **argv) /* {{{ */ } #endif - setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); optind = read_options (argc, argv); #if !_POSIX_SAVED_IDS @@ -1760,6 +1843,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; @@ -1870,6 +1971,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) @@ -1956,6 +2068,12 @@ int main (int argc, char **argv) /* {{{ */ ping_destroy (ping); + if (outfile != NULL) + { + fclose (outfile); + outfile = NULL; + } + if (status == 0) exit (EXIT_SUCCESS); else