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

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