svn commit: r272871 - stable/10/sbin/ping6

2014-10-09 Thread Hiroki Sato 
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.

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.cThu Oct  9 23:47:07 2014
(r272870)
+++ stable/10/sbin/ping6/ping6.cThu 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;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r272871 - stable/10/sbin/ping6

2014-10-09 Thread Bryan Drewery 
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



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r272871 - stable/10/sbin/ping6

2014-10-09 Thread Hiroki Sato 
Bryan Drewery bdrew...@freebsd.org wrote
  in 54371f0b.7060...@freebsd.org:

bd On 10/9/2014 6:48 PM, Hiroki Sato wrote:
bd  Author: hrs
bd  Date: Thu Oct  9 23:48:20 2014
bd  New Revision: 272871
bd  URL: https://svnweb.freebsd.org/changeset/base/272871
bd 
bd  Log:
bdMFC r271909:
bd  Revert changes in r269180.  It could cause -c N option to enter an
bd  infinite loop if no reply packet is received.
bd 
bd
bd Do you plan to merge this to releng/10.1? It seems important for automation.

 Yes, I do.

-- Hiroki


pgpTaLt8X8Eyk.pgp
Description: PGP signature