From owner-svn-src-all@FreeBSD.ORG Thu Oct 9 23:49:49 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B3123FD for ; Thu, 9 Oct 2014 23:49:49 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 7C3ADE54 for ; Thu, 9 Oct 2014 23:49:49 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s99NnnFV002180 for ; Thu, 9 Oct 2014 23:49:49 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s99NnnjO002177 for svn-src-all@freebsd.org; Thu, 9 Oct 2014 23:49:49 GMT (envelope-from bdrewery) Received: (qmail 45803 invoked from network); 9 Oct 2014 18:49:45 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 9 Oct 2014 18:49:45 -0500 Message-ID: <54371F0B.7060900@FreeBSD.org> Date: Thu, 09 Oct 2014 18:49:31 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: Hiroki Sato , 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 References: <201410092348.s99NmLtM086002@svn.freebsd.org> In-Reply-To: <201410092348.s99NmLtM086002@svn.freebsd.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="LrSCUkfMriEa6vP4CpbVwdxDr02JLB6Qd" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2014 23:49:49 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LrSCUkfMriEa6vP4CpbVwdxDr02JLB6Qd Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > MFC r271909: > Revert changes in r269180. It could cause -c N option to enter an > infinite loop if no reply packet is received. >=20 Do you plan to merge this to releng/10.1? It seems important for automati= on. > Modified: > stable/10/sbin/ping6/ping6.c > Directory Properties: > stable/10/ (props changed) >=20 > Modified: stable/10/sbin/ping6/ping6.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 >=3D npackets) { > - struct timeval zerotime =3D {0, 0}; > - itimer.it_value =3D zerotime; > - itimer.it_interval =3D zerotime; > - (void)setitimer(ITIMER_REAL, &itimer, NULL); > - seenalrm =3D 0; /* clear flag */ > - continue; > - } > + if (npackets && ntransmitted >=3D npackets) > + break; > retransmit(); > seenalrm =3D 0; > continue; >=20 --=20 Regards, Bryan Drewery --LrSCUkfMriEa6vP4CpbVwdxDr02JLB6Qd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----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----- --LrSCUkfMriEa6vP4CpbVwdxDr02JLB6Qd--