Fri Jul 24 04:33:50 2015 UTC ()

If we are sending a window probe and there's unacked data in the socket, make
sure at least the persist timer is running.


(matt)

diff -r1.183 -r1.184 src/sys/netinet/tcp_output.c

--- src/sys/netinet/tcp_output.c 2015/05/16 01:15:34	1.183
+++ src/sys/netinet/tcp_output.c 2015/07/24 04:33:50	1.184

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcp_output.c,v 1.183 2015/05/16 01:15:34 kefren Exp $	*/
+/*	$NetBSD: tcp_output.c,v 1.184 2015/07/24 04:33:50 matt Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -125,27 +125,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.183 2015/05/16 01:15:34 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.184 2015/07/24 04:33:50 matt Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_tcp_debug.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/domain.h>
 @@ -1523,34 +1523,44 @@ send:
 				TCP_STATINC(TCP_STAT_SEGSTIMED);
+			}
+		}
 		/*
 		 * Set retransmit timer if not currently set,
 		 * and not doing an ack or a keep-alive probe.
 		 * Initial value for retransmit timer is smoothed
 		 * round-trip time + 2 * round-trip time variance.
 		 * Initialize shift counter which is used for backoff
 		 * of retransmit time.
 		 */
 timer:
-		if (TCP_TIMER_ISARMED(tp, TCPT_REXMT) == 0 &&
+		if (TCP_TIMER_ISARMED(tp, TCPT_REXMT) == 0) {
-			((sack_rxmit && tp->snd_nxt != tp->snd_max) ||
+			if ((sack_rxmit && tp->snd_nxt != tp->snd_max)
-		    tp->snd_nxt != tp->snd_una)) {
+			    || tp->snd_nxt != tp->snd_una) {
-			if (TCP_TIMER_ISARMED(tp, TCPT_PERSIST)) {
+				if (TCP_TIMER_ISARMED(tp, TCPT_PERSIST)) {
-				TCP_TIMER_DISARM(tp, TCPT_PERSIST);
+					TCP_TIMER_DISARM(tp, TCPT_PERSIST);
 					tp->t_rxtshift = 0;
+				}
 				TCP_TIMER_ARM(tp, TCPT_REXMT, tp->t_rxtcur);
 			} else if (len == 0 && so->so_snd.sb_cc > 0
 			    && TCP_TIMER_ISARMED(tp, TCPT_PERSIST) == 0) {
 				/*
 				 * If we are sending a window probe and there's
 				 * unacked data in the socket, make sure at
 				 * least the persist timer is running.
 				 */
 				tp->t_rxtshift = 0;
 				tcp_setpersist(tp);
+			}
 			TCP_TIMER_ARM(tp, TCPT_REXMT, tp->t_rxtcur);
+		}
 	} else
 		if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))
 			tp->snd_max = tp->snd_nxt + len;
 #ifdef TCP_DEBUG
 	/*
 	 * Trace.
 	 */
 	if (so->so_options & SO_DEBUG)
 		tcp_trace(TA_OUTPUT, tp->t_state, tp, m, 0);
 #endif