svn commit: r271909 - head/sbin/ping6

[Hiroki Sato]

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.
  
  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;