diff options
author | delphij <delphij@FreeBSD.org> | 2014-07-28 08:22:08 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-07-28 08:22:08 +0000 |
commit | ac0bb67e4ec4482782ce19e3ddc953a16c272068 (patch) | |
tree | 87bb81b4d6ff9839e0c10df3c29a341b7811c9ad /sbin/ping6 | |
parent | 5b59df4ed393d9374b2e7c1d1959bbd1b2f30de5 (diff) | |
download | FreeBSD-src-ac0bb67e4ec4482782ce19e3ddc953a16c272068.zip FreeBSD-src-ac0bb67e4ec4482782ce19e3ddc953a16c272068.tar.gz |
When interval is set to very small value with limited amount of packets,
ping6(8) would quit before the remote side gets a chance to respond.
Solve this by resetting the itimer when we have reached the maximum packet
number have reached, but let the other handling to continue.
PR: bin/151023
Submitted by: tjmao at tjmao.net
MFC after: 2 weeks
Diffstat (limited to 'sbin/ping6')
-rw-r--r-- | sbin/ping6/ping6.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 01e29a1..b963de1 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1090,8 +1090,14 @@ main(int argc, char *argv[]) /* signal handling */ if (seenalrm) { /* last packet sent, timeout reached? */ - if (npackets && ntransmitted >= npackets) - break; + if (npackets && ntransmitted >= npackets) { + struct timeval zerotime = {0, 0}; + itimer.it_value = zerotime; + itimer.it_interval = zerotime; + (void)setitimer(ITIMER_REAL, &itimer, NULL); + seenalrm = 0; /* clear flag */ + continue; + } retransmit(); seenalrm = 0; continue; |