From 161ab37d24e40dea535714b4d3473a65879e5c9a Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 5 Nov 2016 18:00:36 +0000
Subject: [PATCH] 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
---
 usr.sbin/traceroute6/traceroute6.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index d9dbb40d3590..62dfc6a05f05 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)