summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2016-09-02 14:22:30 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2016-09-02 14:22:30 +0000
commita22e6fe4acae7b82700823fe08911b291e7d1469 (patch)
tree03dcfaedc147bed62b55656a984de335d9db6a61
parentd8c608e8a7f4b255692fe61069d78b27fa8c6056 (diff)
Bring over 1.117 from ping:
---------------------------------------------------------------- Only read time information from the received packet if it is big enough. OK deraadt@ ---------------------------------------------------------------- And with this summary() is in sync between ping and ping6.
-rw-r--r--sbin/ping6/ping6.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 6e11960a7db..64dbf934a02 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.152 2016/09/02 14:14:39 florian Exp $ */
+/* $OpenBSD: ping6.c,v 1.153 2016/09/02 14:22:29 florian Exp $ */
/* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */
/*
@@ -180,6 +180,7 @@ struct timeval interval = {1, 0}; /* interval between packets */
/* timing */
int timing; /* flag to do timing */
+int timinginfo;
unsigned int maxwait = MAXWAIT_DEFAULT; /* max seconds to wait for response */
double tmin = 999999999.0; /* minimum round trip time */
double tmax = 0.0; /* maximum round trip time */
@@ -901,7 +902,7 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr)
return; /* 'Twas not our ECHO */
seq = ntohs(icp->icmp6_seq);
++nreceived;
- if (timing) {
+ if (cc >= 8 + sizeof(struct payload)) {
SIPHASH_CTX ctx;
u_int8_t mac[SIPHASH_DIGEST_LENGTH];
@@ -927,6 +928,7 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr)
(void)printf("signature mismatch!\n");
return;
}
+ timinginfo=1;
tp.tv_sec = betoh64(tv64->tv64_sec) -
tv64_offset.tv64_sec;
@@ -1230,7 +1232,7 @@ summary(void)
ntransmitted));
}
printf("\n");
- if (nreceived && timing) {
+ if (timinginfo) {
/* Only display average to microseconds */
double num = nreceived + nrepeats;
double avg = tsum / num;