X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=e4584d71cc12b526fca4d87cc2c01a505ced4997;hb=3d44d8895a20693c742ec060bc3a743d25519624;hp=c901223acc18826ef495a527d03f9dc4e01b558b;hpb=cc51038cd56c152bd5c38edd27be4b1ac025ad5b;p=liboping.git diff --git a/src/oping.c b/src/oping.c index c901223..e4584d7 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,8 +58,16 @@ # include #endif +#if HAVE_SYS_TYPES_H +#include +#endif + #include "oping.h" +#ifndef _POSIX_SAVED_IDS +# define _POSIX_SAVED_IDS 0 +#endif + typedef struct ping_context { char host[NI_MAXHOST]; @@ -73,6 +85,7 @@ typedef struct ping_context 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; @@ -104,22 +117,35 @@ static ping_context_t *context_create (void) static void context_destroy (ping_context_t *context) { + if (context == NULL) + return; + free (context); } -static void usage_exit (const char *name) +static void usage_exit (const char *name, int status) { int name_length; name_length = (int) strlen (name); - fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval]\n" - "%*s[-t ttl] [-I srcaddr]\n" - "%*s-f filename | host [host [host ...]]\n", - name, - 8 + name_length, "", - 8 + name_length, ""); - exit (1); + 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 (status); } static int read_options (int argc, char **argv) @@ -128,7 +154,7 @@ static int read_options (int argc, char **argv) while (1) { - optchar = getopt (argc, argv, "46c:hi:I:t:f:"); + optchar = getopt (argc, argv, "46c:hi:I:t:f:D:"); if (optchar == -1) break; @@ -146,6 +172,9 @@ static 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; @@ -162,8 +191,8 @@ static int read_options (int argc, char **argv) double new_interval; new_interval = atof (optarg); if (new_interval < 0.001) - fprintf (stderr, "Ignoring invalid interval %g.\n", - new_interval); + fprintf (stderr, "Ignoring invalid interval: %s\n", + optarg); else opt_interval = new_interval; } @@ -176,6 +205,10 @@ static int read_options (int argc, char **argv) } break; + case 'D': + opt_device = optarg; + break; + case 't': { int new_send_ttl; @@ -183,14 +216,16 @@ static int read_options (int argc, char **argv) if ((new_send_ttl > 0) && (new_send_ttl < 256)) opt_send_ttl = new_send_ttl; else - fprintf (stderr, "Invalid TTL argument: %s\n", + 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); } } @@ -273,7 +308,7 @@ static void time_normalize (struct timespec *ts) } } -static void time_calc (struct timespec *ts_dest, +static void time_calc (struct timespec *ts_dest, /* {{{ */ const struct timespec *ts_int, const struct timeval *tv_begin, const struct timeval *tv_end) @@ -297,9 +332,88 @@ static void time_calc (struct timespec *ts_dest, 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 */ + +static int print_header (pingobj_t *ping) /* {{{ */ +{ + pingobj_iter_t *iter; + int i; + + i = 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 (); + + 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); + + buffer_size = 0; + ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size); + + printf ("PING %s (%s) %zu bytes of data.\n", + context->host, context->addr, buffer_size); + + ping_iterator_set_context (iter, (void *) context); + + i++; + } + + return (0); +} /* }}} int print_header */ -int main (int argc, char **argv) +static int print_footer (pingobj_t *ping) +{ + pingobj_iter_t *iter; + + 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); + context_destroy (context); + } + + return (0); +} /* }}} int print_footer */ + +int main (int argc, char **argv) /* {{{ */ { pingobj_t *ping; pingobj_iter_t *iter; @@ -313,17 +427,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) && (opt_filename == NULL)) { - usage_exit (argv[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, "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 (geteuid () != 0) - { - fprintf (stderr, "Need superuser privileges to open a RAW socket. Sorry.\n"); - return (1); + if ((optind >= argc) && (opt_filename == NULL)) { + usage_exit (argv[0], 1); } if ((ping = ping_construct ()) == NULL) @@ -361,6 +500,15 @@ int main (int argc, char **argv) } } + if (opt_device != NULL) + { + if (ping_setopt (ping, PING_OPT_DEVICE, (void *) opt_device) != 0) + { + fprintf (stderr, "Setting device failed: %s\n", + ping_get_error (ping)); + } + } + if (opt_filename != NULL) { FILE *infile; @@ -382,6 +530,17 @@ int main (int argc, char **argv) return (1); } +#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 + while (fgets(line, sizeof(line), infile)) { /* Strip whitespace */ @@ -400,9 +559,31 @@ int main (int argc, char **argv) } } +#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) @@ -414,35 +595,20 @@ int main (int argc, char **argv) } } - /* Drop root privileges if we're setuid-root. */ - setuid (getuid ()); - - i = 0; - for (iter = ping_iterator_get (ping); - iter != NULL; - iter = ping_iterator_next (iter)) + /* Permanently drop root privileges if we're setuid-root. */ + status = setuid (getuid ()); + if (status != 0) { - ping_context_t *context; - size_t buffer_size; - - context = context_create (); - - 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); - - buffer_size = 0; - ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size); - - printf ("PING %s (%s) %zu bytes of data.\n", - context->host, context->addr, buffer_size); + fprintf (stderr, "Dropping privileges failed: %s\n", + strerror (errno)); + exit (EXIT_FAILURE); + } - ping_iterator_set_context (iter, (void *) context); +#if _POSIX_SAVED_IDS + saved_set_uid = (uid_t) -1; +#endif - i++; - } + print_header (ping); if (i == 0) return (1); @@ -511,44 +677,11 @@ int main (int argc, char **argv) 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); - context_destroy (context); - } + print_footer (ping); ping_destroy (ping); return (0); -} +} /* }}} int main */ + +/* vim: set fdm=marker : */