diff options
| author |   florian <florian@openbsd.org> | 2016-09-13 07:11:56 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2016-09-13 07:11:56 +0000 |
| commit | 17d07e9aa47a5049de6030895de21c68b756f077 (patch) | |
| tree | c25bddf9d7ba6649e95b82b7a7473229461d52bf | |
| parent | sync (diff) | |
| download | wireguard-openbsd-17d07e9aa47a5049de6030895de21c68b756f077.tar.xz wireguard-openbsd-17d07e9aa47a5049de6030895de21c68b756f077.zip | |
timinginfo is a global flag that we got at least one packet back with
timing information for the summary line. Here we need to know if the
current echo reply was long enough to carry timing information.
| -rw-r--r-- | sbin/ping/ping.c | 4 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 23b2b1aa9e8..eeeae855f69 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.179 2016/09/12 15:47:57 florian Exp $ */ +/* $OpenBSD: ping.c,v 1.180 2016/09/13 07:11:56 florian Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -986,7 +986,7 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr) (void)printf("%d bytes from %s: icmp_seq=%u", cc, pr_addr(from, fromlen), ntohs(seq)); (void)printf(" ttl=%d", ip->ip_ttl); - if (timinginfo) + if (cc >= ECHOLEN + ECHOTMLEN) (void)printf(" time=%.3f ms", triptime); if (dupflag) (void)printf(" (DUP!)"); diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index a8173947ad4..39134acef9c 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.191 2016/09/12 15:47:58 florian Exp $ */ +/* $OpenBSD: ping6.c,v 1.192 2016/09/13 07:11:56 florian Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -1041,7 +1041,7 @@ pr_pack(u_char *buf, int cc, struct msghdr *mhdr) (void)printf("%d bytes from %s: icmp_seq=%u", cc, pr_addr(from, fromlen), ntohs(seq)); (void)printf(" hlim=%d", hoplim); - if (timinginfo) + if (cc >= ECHOLEN + ECHOTMLEN) (void)printf(" time=%.3f ms", triptime); if (dupflag) (void)printf(" (DUP!)"); |