summaryrefslogtreecommitdiff
path: root/usr.sbin/traceroute6
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2016-11-05 18:00:36 +0000
committerHiroki Sato <hrs@FreeBSD.org>2016-11-05 18:00:36 +0000
commit161ab37d24e40dea535714b4d3473a65879e5c9a (patch)
tree35a9f6217a27f7419876cf8b516baf294e7c8004 /usr.sbin/traceroute6
parentb1b6afa587761c5d56b0a5410a2a8ea9c2248a57 (diff)
downloadsrc-test-161ab37d24e40dea535714b4d3473a65879e5c9a.tar.gz
src-test-161ab37d24e40dea535714b4d3473a65879e5c9a.zip
Fix an infinite loop at an non-responding hop when other echo replies
are kept arriving in the waittime time window. Submitted by: Denny Page PR: 210286 MFC after: 3 days
Notes
Notes: svn path=/head/; revision=308347
Diffstat (limited to 'usr.sbin/traceroute6')
-rw-r--r--usr.sbin/traceroute6/traceroute6.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index d9dbb40d3590e..62dfc6a05f05e 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -955,6 +955,9 @@ main(argc, argv)
break;
}
break;
+ } else if (deltaT(&t1, &t2) > waittime * 1000) {
+ cc = 0;
+ break;
}
}
if (cc == 0)