summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2005-09-01 17:59:14 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2005-09-01 17:59:14 +0000
commit93c74c75c00f4bf20d299b39f6125f16825bd957 (patch)
tree630b985b6a2b652e0de91dea7b11fa5d3260cc0d
parent788aafce216e68e4fa682f8f45fd8db08fa5c31d (diff)
Comment fix and make description of -c and -w match reality more
closely. ok millert@ deraadt@
-rw-r--r--sbin/ping/ping.810
-rw-r--r--sbin/ping/ping.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 3f9306493f8..fec8a644a63 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ping.8,v 1.30 2005/04/14 10:14:30 jmc Exp $
+.\" $OpenBSD: ping.8,v 1.31 2005/09/01 17:59:13 otto Exp $
.\" $NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -77,10 +77,10 @@ packet.
The options are as follows:
.Bl -tag -width Ds
.It Fl c Ar count
-Stop after sending
+Stop sending after
.Ar count
.Tn ECHO_REQUEST
-packets.
+packets have been sent.
.It Fl D
Set the
.Dv Don't Fragment
@@ -192,8 +192,8 @@ packets other than
.Tn ECHO_REPLY
that are received are listed.
.It Fl w Ar maxwait
-Specifies the maximum number of seconds to wait for a response to
-a packet before transmitting the next one.
+Specifies the maximum number of seconds to wait for responses
+after the last request has been sent.
The default is 10.
.El
.Pp
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 9902f6902cd..5da281d3a88 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping.c,v 1.71 2005/05/27 04:55:27 mcbride Exp $ */
+/* $OpenBSD: ping.c,v 1.72 2005/09/01 17:59:13 otto Exp $ */
/* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */
/*
@@ -43,7 +43,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#else
-static const char rcsid[] = "$OpenBSD: ping.c,v 1.71 2005/05/27 04:55:27 mcbride Exp $";
+static const char rcsid[] = "$OpenBSD: ping.c,v 1.72 2005/09/01 17:59:13 otto Exp $";
#endif
#endif /* not lint */
@@ -158,9 +158,9 @@ struct itimerval interstr; /* interval structure for use with setitimer */
/* timing */
int timing; /* flag to do timing */
unsigned int maxwait = MAXWAIT_DEFAULT; /* max seconds to wait for response */
-quad_t tmin = 999999999; /* minimum round trip time in millisec */
-quad_t tmax = 0; /* maximum round trip time in millisec */
-quad_t tsum = 0; /* sum of all times in millisec, for doing average */
+quad_t tmin = 999999999; /* minimum round trip time in usec */
+quad_t tmax = 0; /* maximum round trip time in usec */
+quad_t tsum = 0; /* sum of all times in usec, for doing average */
quad_t tsumsq = 0; /* sum of all times squared, for std. dev. */
int bufspace = IP_MAXPACKET;