int req_sent;
int req_rcvd;
-
+
double latency_min;
double latency_max;
double latency_total;
static double opt_interval = 1.0;
static int opt_addrfamily = PING_DEF_AF;
static char *opt_srcaddr = NULL;
+static char *opt_filename = NULL;
static int opt_count = -1;
+static int opt_send_ttl = 64;
-void sigint_handler (int signal)
+static void sigint_handler (int signal)
{
+ /* Make compiler happy */
+ signal = 0;
/* Exit the loop */
opt_count = 0;
}
-ping_context_t *context_create (void)
+static ping_context_t *context_create (void)
{
ping_context_t *ret;
return (ret);
}
-void context_destroy (ping_context_t *context)
+static void context_destroy (ping_context_t *context)
{
free (context);
}
-void usage_exit (const char *name)
+static void usage_exit (const char *name)
{
- fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval] host [host [host ...]]\n",
- name);
+ 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);
}
-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:");
if (optchar == -1)
break;
}
break;
+ case 'f':
+ {
+ if (opt_filename != NULL)
+ free (opt_filename);
+ opt_filename = strdup (optarg);
+ }
+ break;
+
case 'i':
{
double new_interval;
new_interval = atof (optarg);
- if (new_interval >= 0.2)
+ if (new_interval < 0.001)
+ fprintf (stderr, "Ignoring invalid interval %g.\n",
+ new_interval);
+ else
opt_interval = new_interval;
}
break;
}
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, "Invalid TTL argument: %s\n",
+ optarg);
+ break;
+ }
+
case 'h':
default:
usage_exit (argv[0]);
return (optind);
}
-void print_host (pingobj_iter_t *iter)
+static void print_host (pingobj_iter_t *iter)
{
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);
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,
+ 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);
}
else
{
printf ("echo reply from %s (%s): icmp_seq=%u timeout\n",
context->host, context->addr,
- (unsigned int) sequence);
+ sequence);
}
}
-void time_normalize (struct timespec *ts)
+static void time_normalize (struct timespec *ts)
{
while (ts->tv_nsec < 0)
{
}
}
-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)
optind = read_options (argc, argv);
- if (optind >= argc)
+ if (optind >= argc && !opt_filename) {
usage_exit (argv[0]);
+ }
if (geteuid () != 0)
{
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;
}
}
+ if (opt_filename != NULL)
+ {
+ FILE *infile;
+ char line[256];
+ char host[256];
+
+ if (strncmp(opt_filename, "-", 1) == 0)
+ infile = fdopen(0, "r");
+ else
+ infile = fopen(opt_filename, "r");
+
+ if (!infile)
+ {
+ fprintf (stderr, "Couldn't open file for hostnames: %s\n", strerror(errno));
+ return (1);
+ }
+
+ while (fgets(line, sizeof(line), infile))
+ {
+ if (sscanf(line, "%s", host) != 1)
+ continue;
+
+ if ((!*host) || (host[0] == '#'))
+ continue;
+
+ if (ping_host_add(ping, host) < 0)
+ {
+ const char *errmsg = ping_get_error (ping);
+
+ fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
+ continue;
+ }
+ }
+
+ fclose(infile);
+ }
+
for (i = optind; i < argc; i++)
{
if (ping_host_add (ping, argv[i]) < 0)
buffer_size = 0;
ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size);
- printf ("PING %s (%s) %u bytes of data.\n",
- context->host, context->addr, (unsigned int) buffer_size);
+ printf ("PING %s (%s) %zu bytes of data.\n",
+ context->host, context->addr, buffer_size);
ping_iterator_set_context (iter, (void *) context);
}
ping_iterator_set_context (iter, NULL);
- free (context);
+ context_destroy (context);
}
ping_destroy (ping);
projects / liboping.git / blobdiff