Author: ngie
Date: Sat Apr 30 09:43:01 2016
New Revision: 298843
URL: https://svnweb.freebsd.org/changeset/base/298843
Log:
MFstable/10 r272871:
r272871 (by hrs):
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/9/sbin/ping6/ping6.c
Directory Properties:
stable/9/ (props changed)
stable/9/sbin/ (props changed)
stable/9/sbin/ping6/ (props changed)
Modified: stable/9/sbin/ping6/ping6.c
==============================================================================
--- stable/9/sbin/ping6/ping6.c Sat Apr 30 09:32:19 2016 (r298842)
+++ stable/9/sbin/ping6/ping6.c Sat Apr 30 09:43:01 2016 (r298843)
@@ -1088,14 +1088,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
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
