From: Daniel Collins <daniel.collins@smoothwall.net>
Date: Thu, 9 Jan 2014 11:38:54 +0000 (+0000)
Subject: Implement the "-w <timeout>" command line option.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9f4c3107df0c18f18e0deab19b78f59e4e4d2b9c;p=liboping.git

Implement the "-w <timeout>" command line option.
---

diff --git a/src/oping.c b/src/oping.c
index 28f761c..08423ea 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -192,6 +192,7 @@ typedef struct ping_context
 } ping_context_t;
 
 static double  opt_interval   = 1.0;
+static double  opt_timeout    = PING_DEF_TIMEOUT;
 static int     opt_addrfamily = PING_DEF_AF;
 static char   *opt_srcaddr    = NULL;
 static char   *opt_device     = NULL;
@@ -430,6 +431,7 @@ static void usage_exit (const char *name, int status) /* {{{ */
 			"  -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"
+			"  -w timeout   time to wait for replies, in seconds\n"
 			"  -t ttl       time to live for each ICMP packet\n"
 			"  -Q qos       Quality of Service (QoS) of outgoing packets\n"
 			"               Use \"-Q help\" for a list of valid options.\n"
@@ -645,7 +647,7 @@ static int read_options (int argc, char **argv) /* {{{ */
 
 	while (1)
 	{
-		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:"
+		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:w:"
 #if USE_NCURSES
 				"uUg:"
 #endif
@@ -698,6 +700,22 @@ static int read_options (int argc, char **argv) /* {{{ */
 				}
 				break;
 
+			case 'w':
+			{
+				char *endp;
+				double t = strtod(optarg, &endp);
+				if(optarg[0] != '\0' && *endp == '\0')
+				{
+					opt_timeout = t;
+				}
+				else{
+					fprintf (stderr, "Ignoring invalid timeout: %s\n",
+							optarg);
+				}
+
+				break;
+			}
+
 			case 'I':
 				{
 					if (opt_srcaddr != NULL)
@@ -1715,6 +1733,12 @@ int main (int argc, char **argv) /* {{{ */
 		/* printf ("ts_int = %i.%09li\n", (int) ts_int.tv_sec, ts_int.tv_nsec); */
 	}
 
+	if (ping_setopt (ping, PING_OPT_TIMEOUT, (void*)(&opt_timeout)) != 0)
+	{
+		fprintf (stderr, "Setting timeout failed: %s\n",
+				ping_get_error (ping));
+	}
+
 	if (opt_addrfamily != PING_DEF_AF)
 		ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily);