From owner-svn-src-stable-11@freebsd.org  Wed Nov 16 03:51:06 2016
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 931EBC42A54;
 Wed, 16 Nov 2016 03:51:06 +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 5F393698;
 Wed, 16 Nov 2016 03:51:06 +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 uAG3p5nj023046;
 Wed, 16 Nov 2016 03:51:05 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAG3p572023045;
 Wed, 16 Nov 2016 03:51:05 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201611160351.uAG3p572023045@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: Wed, 16 Nov 2016 03:51:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r308714 - stable/11/usr.sbin/traceroute6
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Nov 2016 03:51:06 -0000

Author: hrs
Date: Wed Nov 16 03:51:05 2016
New Revision: 308714
URL: https://svnweb.freebsd.org/changeset/base/308714

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

Modified:
  stable/11/usr.sbin/traceroute6/traceroute6.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/traceroute6/traceroute6.c
==============================================================================
--- stable/11/usr.sbin/traceroute6/traceroute6.c	Wed Nov 16 03:24:20 2016	(r308713)
+++ stable/11/usr.sbin/traceroute6/traceroute6.c	Wed Nov 16 03:51:05 2016	(r308714)
@@ -955,6 +955,9 @@ main(argc, argv)
 						break;
 					}
 					break;
+				} else if (deltaT(&t1, &t2) > waittime * 1000) {
+					cc = 0;
+					break;
 				}
 			}
 			if (cc == 0)