Date: Thu, 09 Oct 2014 18:49:31 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Hiroki Sato <hrs@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r272871 - stable/10/sbin/ping6 Message-ID: <54371F0B.7060900@FreeBSD.org> In-Reply-To: <201410092348.s99NmLtM086002@svn.freebsd.org> References: <201410092348.s99NmLtM086002@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 10/9/2014 6:48 PM, Hiroki Sato wrote: > Author: hrs > Date: Thu Oct 9 23:48:20 2014 > New Revision: 272871 > URL: https://svnweb.freebsd.org/changeset/base/272871 > > Log: > MFC r271909: > Revert changes in r269180. It could cause -c N option to enter an > infinite loop if no reply packet is received. > Do you plan to merge this to releng/10.1? It seems important for automation. > Modified: > stable/10/sbin/ping6/ping6.c > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sbin/ping6/ping6.c > ============================================================================== > --- stable/10/sbin/ping6/ping6.c Thu Oct 9 23:47:07 2014 (r272870) > +++ stable/10/sbin/ping6/ping6.c Thu Oct 9 23:48:20 2014 (r272871) > @@ -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; > -- Regards, Bryan Drewery [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJUNx8PAAoJEDXXcbtuRpfP5sYIANxQnNiEB059zlrCC/DKFItS QbG8vfq5xpdMgaCpP85NzWWzmP+v48OW0bxaLrb5RGemvrYBRSkeVi/D5t2RAEqZ /MUpaa3ZExfSB+tSLM3Z0JgtvwLVFt2/0kzMimjYa7MyCdwwyxTaINAA9kCmRSca 95Z/4PqR+cDzsuaNWTzAXBe9xVVhSemcBpHCluliSbOhLPJZNubIA7hxCKhcdtc7 /gT+w+jF8NFUNMYAp4byiB3JagpWGicrsCm/iWVyN2Z6xlYmeLXNn6bRWUUseifp vr/6K08+8yJ9Eu929yyml01ucbyuaTBQNU9EHu2ImVr8qieNg7qhIFo6lV5JWlU= =Xw82 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54371F0B.7060900>