diff --git a/src/oping.c b/src/oping.c
index c901223acc18826ef495a527d03f9dc4e01b558b..fc4cb5faeb5f9cdbd393188ca8596e8d2db5bc43 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
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;
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 <octo@verplant.org>\n"
+ "for contributions see `AUTHORS'\n",
+ name);
+ exit (status);
}
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;
new_count = atoi (optarg);
if (new_count > 0)
opt_count = new_count;
+ else
+ fprintf(stderr, "Ignoring invalid count: %s\n",
+ optarg);
}
break;
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;
}
}
break;
+ case 'D':
+ opt_device = optarg;
+ break;
+
case 't':
{
int new_send_ttl;
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);
}
}
optind = read_options (argc, argv);
if ((optind >= argc) && (opt_filename == NULL)) {
- usage_exit (argv[0]);
+ usage_exit (argv[0], 1);
}
if (geteuid () != 0)
}
}
+ 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;