X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=3164230484a94f03e4eebb2175b5ae242b04b64c;hb=77ec8f42e4efb20ee99c95a34c996891ff231501;hp=cfbe18ac59e9d4076cf79318eee5a3fdb3dd968f;hpb=a9899b23c6417b67dc034615ebd815bee0651da1;p=liboping.git

diff --git a/src/oping.c b/src/oping.c
index cfbe18a..3164230 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -63,7 +63,7 @@ typedef struct ping_context
 
 	int req_sent;
 	int req_rcvd;
-	
+
 	double latency_min;
 	double latency_max;
 	double latency_total;
@@ -73,7 +73,9 @@ 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_filename   = NULL;
 static int     opt_count      = -1;
+static int     opt_send_ttl   = 64;
 
 static void sigint_handler (int signal)
 {
@@ -107,8 +109,16 @@ static void context_destroy (ping_context_t *context)
 
 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);
 }
 
@@ -118,7 +128,7 @@ static int read_options (int argc, char **argv)
 
 	while (1)
 	{
-		optchar = getopt (argc, argv, "46c:hi:I:");
+		optchar = getopt (argc, argv, "46c:hi:I:t:f:");
 
 		if (optchar == -1)
 			break;
@@ -139,6 +149,14 @@ static int read_options (int argc, char **argv)
 				}
 				break;
 
+			case 'f':
+				{
+					if (opt_filename != NULL)
+						free (opt_filename);
+					opt_filename = strdup (optarg);
+				}
+				break;
+
 			case 'i':
 				{
 					double new_interval;
@@ -158,6 +176,18 @@ static int read_options (int argc, char **argv)
 				}
 				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]);
@@ -171,18 +201,26 @@ 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);
@@ -201,10 +239,10 @@ static void print_host (pingobj_iter_t *iter)
 		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
 	{
@@ -278,8 +316,9 @@ int main (int argc, char **argv)
 
 	optind = read_options (argc, argv);
 
-	if (optind >= argc)
+	if (optind >= argc && !opt_filename) {
 		usage_exit (argv[0]);
+	}
 
 	if (geteuid () != 0)
 	{
@@ -293,6 +332,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;
@@ -316,6 +361,43 @@ int main (int argc, char **argv)
 		}
 	}
 
+	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)