Date: Sun, 21 Sep 2014 19:29:29 +0200 From: John Hay <jhay@meraka.org.za> To: Hiroki Sato <hrs@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r271909 - head/sbin/ping6 Message-ID: <20140921172929.GA12637@zibbi.meraka.csir.co.za> In-Reply-To: <201409201848.s8KImpDb053310@svn.freebsd.org> References: <201409201848.s8KImpDb053310@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140921172929.GA12637>