From owner-svn-src-head@FreeBSD.ORG  Sun Sep 21 17:29:43 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B701216D;
 Sun, 21 Sep 2014 17:29:43 +0000 (UTC)
Received: from zibbi.meraka.csir.co.za (zibbi.meraka.csir.co.za
 [IPv6:2001:4200:7000:2::1])
 by mx1.freebsd.org (Postfix) with ESMTP id 539C415C;
 Sun, 21 Sep 2014 17:29:43 +0000 (UTC)
Received: by zibbi.meraka.csir.co.za (Postfix, from userid 143891)
 id AD5064A14; Sun, 21 Sep 2014 19:29:29 +0200 (SAST)
Date: Sun, 21 Sep 2014 19:29:29 +0200
From: John Hay <jhay@meraka.org.za>
To: Hiroki Sato <hrs@FreeBSD.org>
Subject: Re: svn commit: r271909 - head/sbin/ping6
Message-ID: <20140921172929.GA12637@zibbi.meraka.csir.co.za>
References: <201409201848.s8KImpDb053310@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201409201848.s8KImpDb053310@svn.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Sep 2014 17:29:43 -0000

On Sat, Sep 20, 2014 at 06:48:51PM +0000, Hiroki Sato wrote:
> Author: hrs
> Date: Sat Sep 20 18:48:50 2014
> New Revision: 271909
> URL: http://svnweb.freebsd.org/changeset/base/271909
> 
> Log:
>   Revert changes in r269180.  It could cause -c N option to enter an
>   infinite loop if no reply packet is received.

r269180 was merged to 10-, 9- and 8-. Maybe it should also be reverted?

Regards

John

>   
>   PR:	151023
> 
> Modified:
>   head/sbin/ping6/ping6.c
> 
> Modified: head/sbin/ping6/ping6.c
> ==============================================================================
> --- head/sbin/ping6/ping6.c	Sat Sep 20 16:43:14 2014	(r271908)
> +++ head/sbin/ping6/ping6.c	Sat Sep 20 18:48:50 2014	(r271909)
> @@ -1090,14 +1090,8 @@ main(int argc, char *argv[])
>  		/* signal handling */
>  		if (seenalrm) {
>  			/* last packet sent, timeout reached? */
> -			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;
> -			}
> +			if (npackets && ntransmitted >= npackets)
> +				break;
>  			retransmit();
>  			seenalrm = 0;
>  			continue;