X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foping.c;h=4f9c5f3e245aa2974b701761c75501973d75c791;hb=6007e719586c58d1dc72285816dc2bc94bd689c5;hp=d4469a8f94f4744a4f5e77c8e40f62c44354b39a;hpb=33a84dc3dca4be5fe92061153277eb5df8a54e7f;p=liboping.git diff --git a/src/oping.c b/src/oping.c index d4469a8..4f9c5f3 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 Florian octo Forster + * Copyright (C) 2006-2010 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 @@ -31,6 +31,10 @@ # error "You don't have the standard C99 header files installed" #endif /* STDC_HEADERS */ +#if HAVE_UNISTD_H +# include +#endif + #if HAVE_MATH_H # include #endif @@ -54,34 +58,66 @@ # include #endif +#if HAVE_SYS_TYPES_H +#include +#endif + +#if USE_NCURSES +# include + +# define OPING_GREEN 1 +# define OPING_YELLOW 2 +# define OPING_RED 3 +#endif + #include "oping.h" +#ifndef _POSIX_SAVED_IDS +# define _POSIX_SAVED_IDS 0 +#endif + typedef struct ping_context { char host[NI_MAXHOST]; char addr[NI_MAXHOST]; + int index; int req_sent; int req_rcvd; - + double latency_min; double latency_max; double latency_total; double latency_total_square; + +#if USE_NCURSES + WINDOW *window; +#endif } ping_context_t; static double opt_interval = 1.0; static int opt_addrfamily = PING_DEF_AF; static char *opt_srcaddr = NULL; +static char *opt_device = NULL; +static char *opt_filename = NULL; static int opt_count = -1; +static int opt_send_ttl = 64; + +static int host_num = 0; -void sigint_handler (int signal) +#if USE_NCURSES +static WINDOW *main_win = NULL; +#endif + +static void sigint_handler (int signal) /* {{{ */ { + /* Make compiler happy */ + signal = 0; /* Exit the loop */ opt_count = 0; -} +} /* }}} void sigint_handler */ -ping_context_t *context_create (void) +static ping_context_t *context_create (void) /* {{{ */ { ping_context_t *ret; @@ -95,28 +131,138 @@ ping_context_t *context_create (void) ret->latency_total = 0.0; ret->latency_total_square = 0.0; +#if USE_NCURSES + ret->window = NULL; +#endif + return (ret); -} +} /* }}} ping_context_t *context_create */ -void context_destroy (ping_context_t *context) +static void context_destroy (ping_context_t *context) /* {{{ */ { + if (context == NULL) + return; + +#if USE_NCURSES + if (context->window != NULL) + { + delwin (context->window); + context->window = NULL; + } +#endif + free (context); -} +} /* }}} void context_destroy */ + +static double context_get_average (ping_context_t *ctx) /* {{{ */ +{ + double num_total; + + if (ctx == NULL) + return (-1.0); + + if (ctx->req_rcvd < 1) + return (-0.0); + + num_total = (double) ctx->req_rcvd; + return (ctx->latency_total / num_total); +} /* }}} double context_get_average */ + +static double context_get_stddev (ping_context_t *ctx) /* {{{ */ +{ + double num_total; + + if (ctx == NULL) + return (-1.0); + + if (ctx->req_rcvd < 1) + return (-0.0); + else if (ctx->req_rcvd < 2) + return (0.0); + + num_total = (double) ctx->req_rcvd; + return (sqrt (((num_total * ctx->latency_total_square) + - (ctx->latency_total * ctx->latency_total)) + / (num_total * (num_total - 1.0)))); +} /* }}} double context_get_stddev */ + +static double context_get_packet_loss (const ping_context_t *ctx) /* {{{ */ +{ + if (ctx == NULL) + return (-1.0); + + if (ctx->req_sent < 1) + return (0.0); + + return (100.0 * (ctx->req_sent - ctx->req_rcvd) + / ((double) ctx->req_sent)); +} /* }}} double context_get_packet_loss */ + +static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */ +{ + pingobj_iter_t *iter; + int index; + + if (ping == NULL) + return (EINVAL); + + index = 0; + for (iter = ping_iterator_get (ping); + iter != NULL; + iter = ping_iterator_next (iter)) + { + ping_context_t *context; + size_t buffer_size; + + context = context_create (); + context->index = index; -void usage_exit (const char *name) + buffer_size = sizeof (context->host); + ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size); + + buffer_size = sizeof (context->addr); + ping_iterator_get_info (iter, PING_INFO_ADDRESS, context->addr, &buffer_size); + + ping_iterator_set_context (iter, (void *) context); + + index++; + } + + return (0); +} /* }}} int ping_initialize_contexts */ + +static void usage_exit (const char *name, int status) /* {{{ */ { - fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval] host [host [host ...]]\n", + int name_length; + + name_length = (int) strlen (name); + + fprintf (stderr, "Usage: %s [OPTIONS] " + "-f filename | host [host [host ...]]\n" + + "\nAvailable options:\n" + " -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" + " -t ttl time to live for each ICMP packet\n" + " -I srcaddr source address\n" + " -D device outgoing interface name\n" + " -f filename filename to read hosts from\n" + + "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n" + "by Florian octo Forster \n" + "for contributions see `AUTHORS'\n", name); - exit (1); -} + exit (status); +} /* }}} void usage_exit */ -int read_options (int argc, char **argv) +static int read_options (int argc, char **argv) /* {{{ */ { int optchar; while (1) { - optchar = getopt (argc, argv, "46c:hi:I:"); + optchar = getopt (argc, argv, "46c:hi:I:t:f:D:"); if (optchar == -1) break; @@ -134,6 +280,17 @@ int read_options (int argc, char **argv) new_count = atoi (optarg); if (new_count > 0) opt_count = new_count; + else + fprintf(stderr, "Ignoring invalid count: %s\n", + optarg); + } + break; + + case 'f': + { + if (opt_filename != NULL) + free (opt_filename); + opt_filename = strdup (optarg); } break; @@ -141,7 +298,10 @@ int read_options (int argc, char **argv) { double new_interval; new_interval = atof (optarg); - if (new_interval >= 0.2) + if (new_interval < 0.001) + fprintf (stderr, "Ignoring invalid interval: %s\n", + optarg); + else opt_interval = new_interval; } break; @@ -153,37 +313,347 @@ int read_options (int argc, char **argv) } break; + case 'D': + opt_device = optarg; + break; + + case 't': + { + int new_send_ttl; + new_send_ttl = atoi (optarg); + if ((new_send_ttl > 0) && (new_send_ttl < 256)) + opt_send_ttl = new_send_ttl; + else + fprintf (stderr, "Ignoring invalid TTL argument: %s\n", + optarg); + break; + } + case 'h': + usage_exit (argv[0], 0); + break; default: - usage_exit (argv[0]); + usage_exit (argv[0], 1); } } return (optind); -} +} /* }}} read_options */ + +static void time_normalize (struct timespec *ts) /* {{{ */ +{ + while (ts->tv_nsec < 0) + { + if (ts->tv_sec == 0) + { + ts->tv_nsec = 0; + return; + } + + ts->tv_sec -= 1; + ts->tv_nsec += 1000000000; + } + + while (ts->tv_nsec >= 1000000000) + { + ts->tv_sec += 1; + ts->tv_nsec -= 1000000000; + } +} /* }}} void time_normalize */ + +static void time_calc (struct timespec *ts_dest, /* {{{ */ + const struct timespec *ts_int, + const struct timeval *tv_begin, + const struct timeval *tv_end) +{ + ts_dest->tv_sec = tv_begin->tv_sec + ts_int->tv_sec; + ts_dest->tv_nsec = (tv_begin->tv_usec * 1000) + ts_int->tv_nsec; + time_normalize (ts_dest); + + /* Assure that `(begin + interval) > end'. + * This may seem overly complicated, but `tv_sec' is of type `time_t' + * which may be `unsigned. *sigh* */ + if ((tv_end->tv_sec > ts_dest->tv_sec) + || ((tv_end->tv_sec == ts_dest->tv_sec) + && ((tv_end->tv_usec * 1000) > ts_dest->tv_nsec))) + { + ts_dest->tv_sec = 0; + ts_dest->tv_nsec = 0; + return; + } + + ts_dest->tv_sec = ts_dest->tv_sec - tv_end->tv_sec; + ts_dest->tv_nsec = ts_dest->tv_nsec - (tv_end->tv_usec * 1000); + time_normalize (ts_dest); +} /* }}} void time_calc */ + +#if USE_NCURSES +static int update_stats_from_context (ping_context_t *ctx) /* {{{ */ +{ + if ((ctx == NULL) || (ctx->window == NULL)) + return (EINVAL); + + werase (ctx->window); + + box (ctx->window, 0, 0); + wattron (ctx->window, A_BOLD); + mvwprintw (ctx->window, /* y = */ 0, /* x = */ 5, + " %s ", ctx->host); + wattroff (ctx->window, A_BOLD); + wprintw (ctx->window, "ping statistics "); + mvwprintw (ctx->window, /* y = */ 1, /* x = */ 2, + "%i packets transmitted, %i received, %.2f%% packet " + "loss, time %.1fms", + ctx->req_sent, ctx->req_rcvd, + context_get_packet_loss (ctx), + ctx->latency_total); + if (ctx->req_rcvd != 0) + { + double average; + double deviation; + + 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, + average, + ctx->latency_max, + deviation); + } + + wrefresh (ctx->window); + + return (0); +} /* }}} int update_stats_from_context */ + +static int on_resize (pingobj_t *ping) /* {{{ */ +{ + pingobj_iter_t *iter; + int width = 0; + int height = 0; + int main_win_height; + + getmaxyx (stdscr, height, width); + 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 + /* Allow scrolling */ + scrollok (main_win, TRUE); + /* wsetscrreg (main_win, 0, main_win_height - 1); */ + /* Allow hardware accelerated scrolling. */ + idlok (main_win, TRUE); + wrefresh (main_win); + + for (iter = ping_iterator_get (ping); + iter != NULL; + iter = ping_iterator_next (iter)) + { + ping_context_t *context; + + context = ping_iterator_get_context (iter); + if (context == NULL) + continue; + + if (context->window != NULL) + { + delwin (context->window); + context->window = NULL; + } + context->window = newwin (/* height = */ 4, + /* width = */ 0, + /* y = */ main_win_height + (4 * context->index), + /* x = */ 0); + } + + return (0); +} /* }}} */ + +static int check_resize (pingobj_t *ping) /* {{{ */ +{ + int need_resize = 0; + + while (42) + { + int key = wgetch (stdscr); + if (key == ERR) + break; + else if (key == KEY_RESIZE) + need_resize = 1; + } + + if (need_resize) + return (on_resize (ping)); + else + return (0); +} /* }}} int check_resize */ + +static int pre_loop_hook (pingobj_t *ping) /* {{{ */ +{ + pingobj_iter_t *iter; + int width = 0; + int height = 0; + int main_win_height; + + initscr (); + cbreak (); + noecho (); + nodelay (stdscr, TRUE); + + getmaxyx (stdscr, height, width); + if ((height < 1) || (width < 1)) + return (EINVAL); + + 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); + } + + main_win_height = height - (4 * host_num); + main_win = newwin (/* height = */ main_win_height, + /* width = */ 0, + /* y = */ 0, /* x = */ 0); + /* Allow scrolling */ + scrollok (main_win, TRUE); + /* wsetscrreg (main_win, 0, main_win_height - 1); */ + /* Allow hardware accelerated scrolling. */ + idlok (main_win, TRUE); + wmove (main_win, /* y = */ main_win_height - 1, /* x = */ 0); + wrefresh (main_win); + + for (iter = ping_iterator_get (ping); + iter != NULL; + iter = ping_iterator_next (iter)) + { + ping_context_t *context; + + context = ping_iterator_get_context (iter); + if (context == NULL) + continue; + + if (context->window != NULL) + { + delwin (context->window); + context->window = NULL; + } + context->window = newwin (/* height = */ 4, + /* width = */ 0, + /* y = */ main_win_height + (4 * context->index), + /* x = */ 0); + } + + + /* Don't know what good this does exactly, but without this code + * "check_resize" will be called right after startup and *somehow* + * this leads to display errors. If we purge all initial characters + * here, the problem goes away. "wgetch" is non-blocking due to + * "nodelay" (see above). */ + while (wgetch (stdscr) != ERR) + { + /* eat up characters */; + } + + return (0); +} /* }}} int pre_loop_hook */ + +static int pre_sleep_hook (pingobj_t *ping) /* {{{ */ +{ + return (check_resize (ping)); +} /* }}} int pre_sleep_hook */ + +static int post_sleep_hook (pingobj_t *ping) /* {{{ */ +{ + return (check_resize (ping)); +} /* }}} int pre_sleep_hook */ +#else /* if !USE_NCURSES */ +static int pre_loop_hook (pingobj_t *ping) /* {{{ */ +{ + pingobj_iter_t *iter; + + for (iter = ping_iterator_get (ping); + iter != NULL; + iter = ping_iterator_next (iter)) + { + ping_context_t *ctx; + size_t buffer_size; + + ctx = ping_iterator_get_context (iter); + if (ctx == NULL) + continue; -void print_host (pingobj_iter_t *iter) + buffer_size = 0; + ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size); + + printf ("PING %s (%s) %zu bytes of data.\n", + ctx->host, ctx->addr, buffer_size); + } + + return (0); +} /* }}} int pre_loop_hook */ + +static int pre_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */ +{ + fflush (stdout); + + return (0); +} /* }}} int pre_sleep_hook */ + +static int post_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */ +{ + return (0); +} /* }}} int post_sleep_hook */ +#endif + +static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ + int index) { double latency; unsigned int sequence; + int recv_ttl; size_t buffer_len; size_t data_len; ping_context_t *context; - + + latency = -1.0; buffer_len = sizeof (latency); ping_iterator_get_info (iter, PING_INFO_LATENCY, &latency, &buffer_len); + sequence = 0; buffer_len = sizeof (sequence); ping_iterator_get_info (iter, PING_INFO_SEQUENCE, &sequence, &buffer_len); + recv_ttl = -1; + buffer_len = sizeof (recv_ttl); + ping_iterator_get_info (iter, PING_INFO_RECV_TTL, + &recv_ttl, &buffer_len); + data_len = 0; ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &data_len); context = (ping_context_t *) ping_iterator_get_context (iter); +#if USE_NCURSES +# define HOST_PRINTF(...) wprintw(main_win, __VA_ARGS__) +#else +# define HOST_PRINTF(...) printf(__VA_ARGS__) +#endif + context->req_sent++; if (latency > 0.0) { @@ -196,67 +666,116 @@ void print_host (pingobj_iter_t *iter) if ((context->latency_min < 0.0) || (context->latency_min > latency)) context->latency_min = latency; - printf ("%u bytes from %s (%s): icmp_seq=%u time=%.2f ms\n", - (unsigned int) data_len, +#if USE_NCURSES + if (has_colors () == TRUE) + { + int color = OPING_GREEN; + double average = context_get_average (context); + double stddev = context_get_stddev (context); + + if ((latency < (average - (2 * stddev))) + || (latency > (average + (2 * stddev)))) + color = OPING_RED; + else if ((latency < (average - stddev)) + || (latency > (average + stddev))) + color = OPING_YELLOW; + + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i " + "time=", + data_len, context->host, context->addr, + sequence, recv_ttl); + wattron (main_win, COLOR_PAIR(color)); + HOST_PRINTF ("%.2f", latency); + wattroff (main_win, COLOR_PAIR(color)); + HOST_PRINTF (" ms\n"); + } + else + { +#endif + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i " + "time=%.2f ms\n", + data_len, context->host, context->addr, - (unsigned int) sequence, latency); + sequence, recv_ttl, latency); +#if USE_NCURSES + } +#endif } else { - printf ("echo reply from %s (%s): icmp_seq=%u timeout\n", +#if USE_NCURSES + if (has_colors () == TRUE) + { + HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u ", + context->host, context->addr, + sequence); + wattron (main_win, COLOR_PAIR(OPING_RED) | A_BOLD); + HOST_PRINTF ("timeout"); + wattroff (main_win, COLOR_PAIR(OPING_RED) | A_BOLD); + HOST_PRINTF ("\n"); + } + else + { +#endif + HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u timeout\n", context->host, context->addr, - (unsigned int) sequence); + sequence); +#if USE_NCURSES + } +#endif } -} -void time_normalize (struct timespec *ts) +#if USE_NCURSES + update_stats_from_context (context); + wrefresh (main_win); +#endif +} /* }}} void update_host_hook */ + +static int post_loop_hook (pingobj_t *ping) /* {{{ */ { - while (ts->tv_nsec < 0) - { - if (ts->tv_sec == 0) - { - ts->tv_nsec = 0; - return; - } + pingobj_iter_t *iter; - ts->tv_sec -= 1; - ts->tv_nsec += 1000000000; - } +#if USE_NCURSES + endwin (); +#endif - while (ts->tv_nsec >= 1000000000) + for (iter = ping_iterator_get (ping); + iter != NULL; + iter = ping_iterator_next (iter)) { - ts->tv_sec += 1; - ts->tv_nsec -= 1000000000; - } -} + ping_context_t *context; -void time_calc (struct timespec *ts_dest, - const struct timespec *ts_int, - const struct timeval *tv_begin, - const struct timeval *tv_end) -{ - ts_dest->tv_sec = tv_begin->tv_sec + ts_int->tv_sec; - ts_dest->tv_nsec = (tv_begin->tv_usec * 1000) + ts_int->tv_nsec; - time_normalize (ts_dest); + context = ping_iterator_get_context (iter); - /* Assure that `(begin + interval) > end'. - * This may seem overly complicated, but `tv_sec' is of type `time_t' - * which may be `unsigned. *sigh* */ - if ((tv_end->tv_sec > ts_dest->tv_sec) - || ((tv_end->tv_sec == ts_dest->tv_sec) - && ((tv_end->tv_usec * 1000) > ts_dest->tv_nsec))) - { - ts_dest->tv_sec = 0; - ts_dest->tv_nsec = 0; - return; + printf ("\n--- %s ping statistics ---\n" + "%i packets transmitted, %i received, %.2f%% packet loss, time %.1fms\n", + context->host, context->req_sent, context->req_rcvd, + context_get_packet_loss (context), + context->latency_total); + + if (context->req_rcvd != 0) + { + double average; + double deviation; + + average = context_get_average (context); + deviation = context_get_stddev (context); + + printf ("rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n", + context->latency_min, + average, + context->latency_max, + deviation); + } + + ping_iterator_set_context (iter, NULL); + context_destroy (context); } - ts_dest->tv_sec = ts_dest->tv_sec - tv_end->tv_sec; - ts_dest->tv_nsec = ts_dest->tv_nsec - (tv_end->tv_usec * 1000); - time_normalize (ts_dest); -} + return (0); +} /* }}} int post_loop_hook */ -int main (int argc, char **argv) +int main (int argc, char **argv) /* {{{ */ { pingobj_t *ping; pingobj_iter_t *iter; @@ -270,16 +789,42 @@ int main (int argc, char **argv) int optind; int i; + int status; +#if _POSIX_SAVED_IDS + uid_t saved_set_uid; + + /* Save the old effective user id */ + saved_set_uid = geteuid (); + /* Set the effective user ID to the real user ID without changing the + * saved set-user ID */ + status = seteuid (getuid ()); + if (status != 0) + { + fprintf (stderr, "Temporarily dropping privileges " + "failed: %s\n", strerror (errno)); + exit (EXIT_FAILURE); + } +#endif optind = read_options (argc, argv); - if (optind >= argc) - usage_exit (argv[0]); - - if (geteuid () != 0) +#if !_POSIX_SAVED_IDS + /* Cannot temporarily drop privileges -> reject every file but "-". */ + if ((opt_filename != NULL) + && (strcmp ("-", opt_filename) != 0) + && (getuid () != geteuid ())) { - fprintf (stderr, "Need superuser privileges to open a RAW socket. Sorry.\n"); - return (1); + fprintf (stderr, "Your real and effective user IDs don't " + "match. Reading from a file (option '-f')\n" + "is therefore too risky. You can still read " + "from STDIN using '-f -' if you like.\n" + "Sorry.\n"); + exit (EXIT_FAILURE); + } +#endif + + if ((optind >= argc) && (opt_filename == NULL)) { + usage_exit (argv[0], 1); } if ((ping = ping_construct ()) == NULL) @@ -288,6 +833,12 @@ int main (int argc, char **argv) return (1); } + if (ping_setopt (ping, PING_OPT_TTL, &opt_send_ttl) != 0) + { + fprintf (stderr, "Setting TTL to %i failed: %s\n", + opt_send_ttl, ping_get_error (ping)); + } + { double temp_sec; double temp_nsec; @@ -311,43 +862,123 @@ int main (int argc, char **argv) } } - for (i = optind; i < argc; i++) + if (opt_device != NULL) { - if (ping_host_add (ping, argv[i]) < 0) + if (ping_setopt (ping, PING_OPT_DEVICE, (void *) opt_device) != 0) { - const char *errmsg = ping_get_error (ping); - - fprintf (stderr, "Adding host `%s' failed: %s\n", argv[i], errmsg); - continue; + fprintf (stderr, "Setting device failed: %s\n", + ping_get_error (ping)); } } - i = 0; - for (iter = ping_iterator_get (ping); - iter != NULL; - iter = ping_iterator_next (iter)) + if (opt_filename != NULL) { - ping_context_t *context; - size_t buffer_size; + FILE *infile; + char line[256]; + char host[256]; - context = context_create (); + if (strcmp (opt_filename, "-") == 0) + /* Open STDIN */ + infile = fdopen(0, "r"); + else + infile = fopen(opt_filename, "r"); - buffer_size = sizeof (context->host); - ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size); + if (infile == NULL) + { + fprintf (stderr, "Opening %s failed: %s\n", + (strcmp (opt_filename, "-") == 0) + ? "STDIN" : opt_filename, + strerror(errno)); + return (1); + } - buffer_size = sizeof (context->addr); - ping_iterator_get_info (iter, PING_INFO_ADDRESS, context->addr, &buffer_size); +#if _POSIX_SAVED_IDS + /* Regain privileges */ + status = seteuid (saved_set_uid); + if (status != 0) + { + fprintf (stderr, "Temporarily re-gaining privileges " + "failed: %s\n", strerror (errno)); + exit (EXIT_FAILURE); + } +#endif - buffer_size = 0; - ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size); + while (fgets(line, sizeof(line), infile)) + { + /* Strip whitespace */ + if (sscanf(line, "%s", host) != 1) + continue; - printf ("PING %s (%s) %u bytes of data.\n", - context->host, context->addr, (unsigned int) buffer_size); + if ((host[0] == 0) || (host[0] == '#')) + continue; - ping_iterator_set_context (iter, (void *) context); + if (ping_host_add(ping, host) < 0) + { + const char *errmsg = ping_get_error (ping); - i++; + fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg); + continue; + } + else + { + host_num++; + } + } + +#if _POSIX_SAVED_IDS + /* Drop privileges */ + status = seteuid (getuid ()); + if (status != 0) + { + fprintf (stderr, "Temporarily dropping privileges " + "failed: %s\n", strerror (errno)); + exit (EXIT_FAILURE); + } +#endif + + fclose(infile); + } + +#if _POSIX_SAVED_IDS + /* Regain privileges */ + status = seteuid (saved_set_uid); + if (status != 0) + { + fprintf (stderr, "Temporarily re-gaining privileges " + "failed: %s\n", strerror (errno)); + exit (EXIT_FAILURE); } +#endif + + for (i = optind; i < argc; i++) + { + if (ping_host_add (ping, argv[i]) < 0) + { + const char *errmsg = ping_get_error (ping); + + fprintf (stderr, "Adding host `%s' failed: %s\n", argv[i], errmsg); + continue; + } + else + { + host_num++; + } + } + + /* Permanently drop root privileges if we're setuid-root. */ + status = setuid (getuid ()); + if (status != 0) + { + fprintf (stderr, "Dropping privileges failed: %s\n", + strerror (errno)); + exit (EXIT_FAILURE); + } + +#if _POSIX_SAVED_IDS + saved_set_uid = (uid_t) -1; +#endif + + ping_initialize_contexts (ping); if (i == 0) return (1); @@ -360,8 +991,11 @@ int main (int argc, char **argv) return (1); } + pre_loop_hook (ping); + while (opt_count != 0) { + int index; int status; if (gettimeofday (&tv_begin, NULL) < 0) @@ -377,13 +1011,16 @@ int main (int argc, char **argv) return (1); } + index = 0; for (iter = ping_iterator_get (ping); iter != NULL; iter = ping_iterator_next (iter)) { - print_host (iter); + update_host_hook (iter, index); + index++; } - fflush (stdout); + + pre_sleep_hook (ping); /* Don't sleep in the last iteration */ if (opt_count == 1) @@ -412,48 +1049,17 @@ int main (int argc, char **argv) } } + post_sleep_hook (ping); + if (opt_count > 0) opt_count--; } /* while (opt_count != 0) */ - for (iter = ping_iterator_get (ping); - iter != NULL; - iter = ping_iterator_next (iter)) - { - ping_context_t *context; - - context = ping_iterator_get_context (iter); - - printf ("\n--- %s ping statistics ---\n" - "%i packets transmitted, %i received, %.2f%% packet loss, time %.1fms\n", - context->host, context->req_sent, context->req_rcvd, - 100.0 * (context->req_sent - context->req_rcvd) / ((double) context->req_sent), - context->latency_total); - - if (context->req_rcvd != 0) - { - double num_total; - double average; - double deviation; - - num_total = (double) context->req_rcvd; - - average = context->latency_total / num_total; - deviation = sqrt (((num_total * context->latency_total_square) - (context->latency_total * context->latency_total)) - / (num_total * (num_total - 1.0))); - - printf ("rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n", - context->latency_min, - average, - context->latency_max, - deviation); - } - - ping_iterator_set_context (iter, NULL); - free (context); - } + post_loop_hook (ping); ping_destroy (ping); return (0); -} +} /* }}} int main */ + +/* vim: set fdm=marker : */