X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foping.c;h=6a82c59c186c498059a8b13790f34e440b1f178f;hb=8557f59b71eb64324dcbb0e470bad9ca5958b2f0;hp=4f9c5f3e245aa2974b701761c75501973d75c791;hpb=6007e719586c58d1dc72285816dc2bc94bd689c5;p=liboping.git diff --git a/src/oping.c b/src/oping.c index 4f9c5f3..6a82c59 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 @@ -25,6 +25,8 @@ # include # include # include +# include +# include # include # include #else @@ -50,6 +52,16 @@ # endif #endif +#if HAVE_SYS_SOCKET_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP_H +# include +#endif + #if HAVE_NETDB_H # include /* NI_MAXHOST */ #endif @@ -62,12 +74,52 @@ #include #endif +#include +#include + #if USE_NCURSES -# include +# define NCURSES_OPAQUE 1 +/* 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" @@ -76,6 +128,15 @@ # define _POSIX_SAVED_IDS 0 #endif +#ifndef IPTOS_MINCOST +# define IPTOS_MINCOST 0x02 +#endif + +/* Remove GNU specific __attribute__ settings when using another compiler */ +#if !__GNUC__ +# define __attribute__(x) /**/ +#endif + typedef struct ping_context { char host[NI_MAXHOST]; @@ -102,6 +163,11 @@ static char *opt_device = NULL; static char *opt_filename = NULL; static int opt_count = -1; static int opt_send_ttl = 64; +static uint8_t opt_send_qos = 0; +static double opt_exit_status_threshold = 1.0; +#if USE_NCURSES +static int opt_utf8 = 0; +#endif static int host_num = 0; @@ -233,10 +299,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" @@ -245,9 +307,16 @@ static void usage_exit (const char *name, int status) /* {{{ */ " -c count number of ICMP packets to send\n" " -i interval interval with which to send ICMP packets\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" +#if USE_NCURSES + " -u / -U force / disable UTF-8 output\n" +#endif + " -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" @@ -256,13 +325,205 @@ 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) + fprintf (stderr, "Invalid QoS argument: \"%s\"\n\n", arg); + + fprintf (stderr, "Valid QoS arguments (option \"-Q\") are:\n" + "\n" + " Differentiated Services (IPv4 and IPv6, RFC 2474)\n" + "\n" + " 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" + " For example: \"cs1\" (priority traffic)\n" + "\n" + " Type of Service (IPv4, RFC 1349, obsolete)\n" + "\n" + " lowdelay (%#04x) minimize delay\n" + " throughput (%#04x) maximize throughput\n" + " reliability (%#04x) maximize reliability\n" + " mincost (%#04x) minimize monetary cost\n" + "\n" + " Specify manually\n" + "\n" + " 0x00 - 0xff Hexadecimal numeric specification.\n" + " 0 - 255 Decimal numeric specification.\n" + "\n", + (unsigned int) IPTOS_LOWDELAY, + (unsigned int) IPTOS_THROUGHPUT, + (unsigned int) IPTOS_RELIABILITY, + (unsigned int) IPTOS_MINCOST); + + exit (status); +} /* }}} void usage_qos_exit */ + +static int set_opt_send_qos (const char *opt) /* {{{ */ +{ + if (opt == NULL) + return (EINVAL); + + if (strcasecmp ("help", opt) == 0) + usage_qos_exit (/* arg = */ NULL, /* status = */ EXIT_SUCCESS); + /* DiffServ (RFC 2474): */ + /* - Best effort (BE) */ + else if (strcasecmp ("be", opt) == 0) + opt_send_qos = 0; + /* - 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 = 0; + uint8_t prec = 0; + + /* There are four classes, AF1x, AF2x, AF3x, and AF4x. */ + if (opt[2] == '1') + class = 1; + else if (opt[2] == '2') + class = 2; + else if (opt[2] == '3') + class = 3; + else if (opt[2] == '4') + class = 4; + else + usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_SUCCESS); + + /* In each class, there are three precedences, AFx1, AFx2, and AFx3 */ + if (opt[3] == '1') + prec = 1; + else if (opt[3] == '2') + prec = 2; + else if (opt[3] == '3') + prec = 3; + else + usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_SUCCESS); + + dscp = (8 * class) + (2 * prec); + /* The lower two bits are used for Explicit Congestion Notification (ECN) */ + opt_send_qos = dscp << 2; + } + /* - Class Selector (CS) */ + else if ((strncasecmp ("cs", opt, strlen ("cs")) == 0) + && (strlen (opt) == 3)) + { + uint8_t class; + + if ((opt[2] < '0') || (opt[2] > '7')) + usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_FAILURE); + + /* Not exactly legal by the C standard, but I don't know of any + * system not supporting this hack. */ + class = ((uint8_t) opt[2]) - ((uint8_t) '0'); + opt_send_qos = class << 5; + } + /* Type of Service (RFC 1349) */ + else if (strcasecmp ("lowdelay", opt) == 0) + opt_send_qos = IPTOS_LOWDELAY; + else if (strcasecmp ("throughput", opt) == 0) + opt_send_qos = IPTOS_THROUGHPUT; + else if (strcasecmp ("reliability", opt) == 0) + opt_send_qos = IPTOS_RELIABILITY; + else if (strcasecmp ("mincost", opt) == 0) + opt_send_qos = IPTOS_MINCOST; + /* Numeric value */ + else + { + unsigned long value; + char *endptr; + + errno = 0; + endptr = NULL; + value = strtoul (opt, &endptr, /* base = */ 0); + if ((errno != 0) || (endptr == opt) + || (endptr == NULL) || (*endptr != 0) + || (value > 0xff)) + usage_qos_exit (/* arg = */ opt, /* status = */ EXIT_FAILURE); + + opt_send_qos = (uint8_t) value; + } + + return (0); +} /* }}} int set_opt_send_qos */ + +static char *format_qos (uint8_t qos, char *buffer, size_t buffer_size) /* {{{ */ +{ + uint8_t dscp; + uint8_t ecn; + char *dscp_str; + char *ecn_str; + + dscp = qos >> 2; + ecn = qos & 0x03; + + switch (dscp) + { + 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; + case 0x12: dscp_str = "af21"; break; + case 0x14: dscp_str = "af22"; break; + case 0x16: dscp_str = "af23"; break; + case 0x1a: dscp_str = "af31"; break; + case 0x1c: dscp_str = "af32"; break; + case 0x1e: dscp_str = "af33"; break; + case 0x22: dscp_str = "af41"; break; + case 0x24: dscp_str = "af42"; break; + case 0x26: dscp_str = "af43"; break; + case 0x08: dscp_str = "cs1"; break; + case 0x10: dscp_str = "cs2"; break; + case 0x18: dscp_str = "cs3"; break; + case 0x20: dscp_str = "cs4"; break; + case 0x28: dscp_str = "cs5"; break; + case 0x30: dscp_str = "cs6"; break; + case 0x38: dscp_str = "cs7"; break; + default: dscp_str = NULL; + } + + switch (ecn) + { + case 0x01: ecn_str = ",ecn(1)"; break; + case 0x02: ecn_str = ",ecn(0)"; break; + case 0x03: ecn_str = ",ce"; break; + default: ecn_str = ""; + } + + if (dscp_str == NULL) + snprintf (buffer, buffer_size, "0x%02x%s", dscp, ecn_str); + else + snprintf (buffer, buffer_size, "%s%s", dscp_str, ecn_str); + buffer[buffer_size - 1] = 0; + + return (buffer); +} /* }}} char *format_qos */ + static int read_options (int argc, char **argv) /* {{{ */ { int optchar; while (1) { - optchar = getopt (argc, argv, "46c:hi:I:t:f:D:"); + optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:" +#if USE_NCURSES + "uU" +#endif + ); if (optchar == -1) break; @@ -329,6 +590,37 @@ static int read_options (int argc, char **argv) /* {{{ */ break; } + case 'Q': + set_opt_send_qos (optarg); + break; + +#if USE_NCURSES + case 'u': + opt_utf8 = 2; + break; + case 'U': + opt_utf8 = 1; + break; +#endif + + case 'Z': + { + char *endptr = NULL; + double tmp; + + errno = 0; + tmp = strtod (optarg, &endptr); + if ((errno != 0) || (endptr == NULL) || (*endptr != 0) || (tmp < 0.0) || (tmp > 100.0)) + { + fprintf (stderr, "Ignoring invalid -Z argument: %s\n", optarg); + fprintf (stderr, "The \"-Z\" option requires a numeric argument between 0 and 100.\n"); + } + else + opt_exit_status_threshold = tmp / 100.0; + + break; + } + case 'h': usage_exit (argv[0], 0); break; @@ -388,12 +680,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 = '!'; + + int x_max; + int x_pos; + + x_max = getmaxx (ctx->window); + x_pos = ((sequence - 1) % (x_max - 4)) + 2; + + if (latency >= 0.0) + { + double ratio; + + size_t symbols_num = hist_symbols_acs_num; + size_t colors_num = 1; + + size_t index_symbols; + size_t index_colors; + size_t intensity; + + /* latency is in milliseconds, opt_interval is in seconds. */ + ratio = (latency * 0.001) / opt_interval; + if (ratio > 1) { + ratio = 1.0; + } + + if (has_utf8 ()) + symbols_num = hist_symbols_utf8_num; + + if (has_colors () == TRUE) + colors_num = hist_colors_num; + + intensity = (size_t) (ratio * ((double) (symbols_num * colors_num))); + if (intensity >= (symbols_num * colors_num)) + intensity = (symbols_num * colors_num) - 1; + + index_symbols = intensity % symbols_num; + assert (index_symbols < symbols_num); + + index_colors = intensity / symbols_num; + assert (index_colors < colors_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); + + if (has_colors () == TRUE) + 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); + + if (has_colors () == TRUE) + 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); @@ -414,7 +814,7 @@ static int update_stats_from_context (ping_context_t *ctx) /* {{{ */ average = context_get_average (ctx); deviation = context_get_stddev (ctx); - + mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2, "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms", ctx->latency_min, @@ -423,6 +823,8 @@ static int update_stats_from_context (ping_context_t *ctx) /* {{{ */ deviation); } + update_prettyping_graph (ctx, latency, sequence); + wrefresh (ctx->window); return (0); @@ -439,15 +841,8 @@ static int on_resize (pingobj_t *ping) /* {{{ */ if ((height < 1) || (width < 1)) return (EINVAL); - main_win_height = height - (4 * host_num); -#if 1 - wresize (main_win, main_win_height, /* width = */ 0); -#else - delwin (main_win); - main_win = newwin (/* height = */ main_win_height, - /* width = */ 0, - /* y = */ 0, /* x = */ 0); -#endif + main_win_height = height - (5 * host_num); + wresize (main_win, main_win_height, /* width = */ width); /* Allow scrolling */ scrollok (main_win, TRUE); /* wsetscrreg (main_win, 0, main_win_height - 1); */ @@ -470,9 +865,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); } @@ -520,11 +915,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); @@ -549,9 +947,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); } @@ -618,11 +1016,13 @@ 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; int recv_ttl; + uint8_t recv_qos; + char recv_qos_str[16]; size_t buffer_len; size_t data_len; ping_context_t *context; @@ -642,6 +1042,11 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ ping_iterator_get_info (iter, PING_INFO_RECV_TTL, &recv_ttl, &buffer_len); + recv_qos = 0; + buffer_len = sizeof (recv_qos); + ping_iterator_get_info (iter, PING_INFO_RECV_QOS, + &recv_qos, &buffer_len); + data_len = 0; ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &data_len); @@ -680,10 +1085,16 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ || (latency > (average + stddev))) color = OPING_YELLOW; - HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i " - "time=", + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", data_len, context->host, context->addr, - sequence, recv_ttl); + 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)); @@ -692,11 +1103,16 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ else { #endif - HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i " - "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, 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 @@ -726,14 +1142,18 @@ 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 */ +/* Prints statistics for each host, cleans up the contexts and returns the + * number of hosts which failed to return more than the fraction + * opt_exit_status_threshold of pings. */ static int post_loop_hook (pingobj_t *ping) /* {{{ */ { pingobj_iter_t *iter; + int failure_count = 0; #if USE_NCURSES endwin (); @@ -753,6 +1173,13 @@ static int post_loop_hook (pingobj_t *ping) /* {{{ */ context_get_packet_loss (context), context->latency_total); + { + double pct_failed = 1.0 - (((double) context->req_rcvd) + / ((double) context->req_sent)); + if (pct_failed > opt_exit_status_threshold) + failure_count++; + } + if (context->req_rcvd != 0) { double average; @@ -772,7 +1199,7 @@ static int post_loop_hook (pingobj_t *ping) /* {{{ */ context_destroy (context); } - return (0); + return (failure_count); } /* }}} int post_loop_hook */ int main (int argc, char **argv) /* {{{ */ @@ -806,6 +1233,7 @@ int main (int argc, char **argv) /* {{{ */ } #endif + setlocale(LC_ALL, ""); optind = read_options (argc, argv); #if !_POSIX_SAVED_IDS @@ -839,6 +1267,12 @@ int main (int argc, char **argv) /* {{{ */ opt_send_ttl, ping_get_error (ping)); } + if (ping_setopt (ping, PING_OPT_QOS, &opt_send_qos) != 0) + { + fprintf (stderr, "Setting TOS to %i failed: %s\n", + opt_send_qos, ping_get_error (ping)); + } + { double temp_sec; double temp_nsec; @@ -1004,7 +1438,12 @@ int main (int argc, char **argv) /* {{{ */ return (1); } - if (ping_send (ping) < 0) + status = ping_send (ping); + if (status == -EINTR) + { + continue; + } + else if (status < 0) { fprintf (stderr, "ping_send failed: %s\n", ping_get_error (ping)); @@ -1037,14 +1476,13 @@ int main (int argc, char **argv) /* {{{ */ /* printf ("Sleeping for %i.%09li seconds\n", (int) ts_wait.tv_sec, ts_wait.tv_nsec); */ while ((status = nanosleep (&ts_wait, &ts_wait)) != 0) { - if (errno != EINTR) + if (errno == EINTR) { - perror ("nanosleep"); - break; + continue; } - else if (opt_count == 0) + else { - /* sigint */ + perror ("nanosleep"); break; } } @@ -1055,11 +1493,19 @@ int main (int argc, char **argv) /* {{{ */ opt_count--; } /* while (opt_count != 0) */ - post_loop_hook (ping); + /* Returns the number of failed hosts according to -Z. */ + status = post_loop_hook (ping); ping_destroy (ping); - return (0); + if (status == 0) + exit (EXIT_SUCCESS); + else + { + if (status > 255) + status = 255; + exit (status); + } } /* }}} int main */ /* vim: set fdm=marker : */