diff --git a/src/oping.c b/src/oping.c
index 1c1df5426ff52ac793716dd696489b054027d84f..06fb80143f7c7176fffeb7a35555835b209d4676 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
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;
static void sigint_handler (int signal)
{
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);
}
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:");
+ optchar = getopt (argc, argv, "46c:hi:I:t:f:");
if (optchar == -1)
break;
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;
{
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;
}
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':
default:
usage_exit (argv[0]);
{
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 ("%zu bytes from %s (%s): icmp_seq=%u time=%.2f ms\n",
+ printf ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i time=%.2f ms\n",
data_len,
context->host, context->addr,
- sequence, latency);
+ sequence, recv_ttl, latency);
}
else
{
optind = read_options (argc, argv);
- if (optind >= argc)
+ if ((optind >= argc) && (opt_filename == NULL)) {
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 (strcmp (opt_filename, "-") == 0)
+ /* Open STDIN */
+ infile = fdopen(0, "r");
+ else
+ infile = fopen(opt_filename, "r");
+
+ if (infile == NULL)
+ {
+ fprintf (stderr, "Opening %s failed: %s\n",
+ (strcmp (opt_filename, "-") == 0)
+ ? "STDIN" : opt_filename,
+ strerror(errno));
+ return (1);
+ }
+
+ while (fgets(line, sizeof(line), infile))
+ {
+ /* Strip whitespace */
+ if (sscanf(line, "%s", host) != 1)
+ continue;
+
+ if ((host[0] == 0) || (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)
}
ping_iterator_set_context (iter, NULL);
- free (context);
+ context_destroy (context);
}
ping_destroy (ping);