From owner-svn-src-head@freebsd.org  Sat Nov  5 18:00:37 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 942D4AF7CF9;
 Sat,  5 Nov 2016 18:00:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5DB2B616;
 Sat,  5 Nov 2016 18:00:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA5I0aTL010963;
 Sat, 5 Nov 2016 18:00:36 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA5I0akj010962;
 Sat, 5 Nov 2016 18:00:36 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201611051800.uA5I0akj010962@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 5 Nov 2016 18:00:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308347 - head/usr.sbin/traceroute6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Nov 2016 18:00:37 -0000

Author: hrs
Date: Sat Nov  5 18:00:36 2016
New Revision: 308347
URL: https://svnweb.freebsd.org/changeset/base/308347

Log:
  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

Modified:
  head/usr.sbin/traceroute6/traceroute6.c

Modified: head/usr.sbin/traceroute6/traceroute6.c
==============================================================================
--- head/usr.sbin/traceroute6/traceroute6.c	Sat Nov  5 17:02:38 2016	(r308346)
+++ head/usr.sbin/traceroute6/traceroute6.c	Sat Nov  5 18:00:36 2016	(r308347)
@@ -955,6 +955,9 @@ main(argc, argv)
 						break;
 					}
 					break;
+				} else if (deltaT(&t1, &t2) > waittime * 1000) {
+					cc = 0;
+					break;
 				}
 			}
 			if (cc == 0)