X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=6263a4def36459c7d94c8dbbb362cc89b56a9f6e;hb=0a2a9fe209b27e37d15096fa730bac9520dfeced;hp=28f761cfffaad55418d7103eb7f9e69de835971d;hpb=b525c9c88c988fa45593700d9a4846faa388922a;p=liboping.git

diff --git a/src/oping.c b/src/oping.c
index 28f761c..6263a4d 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -192,9 +192,11 @@ 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;
+static char   *opt_mark       = NULL;
 static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
 static int     opt_send_ttl   = 64;
@@ -430,11 +432,13 @@ 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"
 			"  -I srcaddr   source address\n"
 			"  -D device    outgoing interface name\n"
+			"  -m mark      mark to set on outgoing packets\n"
 			"  -f filename  filename to read hosts from\n"
 #if USE_NCURSES
 			"  -u / -U      force / disable UTF-8 output\n"
@@ -645,7 +649,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:m:w:"
 #if USE_NCURSES
 				"uUg:"
 #endif
@@ -698,6 +702,18 @@ static int read_options (int argc, char **argv) /* {{{ */
 				}
 				break;
 
+			case 'w':
+				{
+					char *endp = NULL;
+					double t = strtod (optarg, &endp);
+					if ((optarg[0] != 0) && (endp != NULL) && (*endp == 0))
+						opt_timeout = t;
+					else
+						fprintf (stderr, "Ignoring invalid timeout: %s\n",
+								optarg);
+				}
+				break;
+
 			case 'I':
 				{
 					if (opt_srcaddr != NULL)
@@ -710,6 +726,10 @@ static int read_options (int argc, char **argv) /* {{{ */
 				opt_device = optarg;
 				break;
 
+			case 'm':
+				opt_mark = optarg;
+				break;
+
 			case 't':
 			{
 				int new_send_ttl;
@@ -1664,7 +1684,7 @@ int main (int argc, char **argv) /* {{{ */
 	}
 #endif
 
-        setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 	optind = read_options (argc, argv);
 
 #if !_POSIX_SAVED_IDS
@@ -1715,6 +1735,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);
 
@@ -1736,6 +1762,23 @@ int main (int argc, char **argv) /* {{{ */
 		}
 	}
 
+	if(opt_mark != NULL)
+	{
+		char *endp;
+		int mark = strtoul(opt_mark, &endp, 0);
+		if(opt_mark[0] != '\0' && *endp == '\0')
+		{
+			if(ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0)
+			{
+				fprintf (stderr, "Setting mark failed: %s\n",
+					ping_get_error (ping));
+			}
+		}
+		else{
+			fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
+		}
+	}
+
 	if (opt_filename != NULL)
 	{
 		FILE *infile;