Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jan 2014 23:00:59 +0000 (UTC)
From:      Peter Wemm <peter@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r260417 - stable/10/sys/netinet
Message-ID:  <201401072300.s07N0x2b040145@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: peter
Date: Tue Jan  7 23:00:58 2014
New Revision: 260417
URL: http://svnweb.freebsd.org/changeset/base/260417

Log:
  MFC r258821 - fix tcp simultaneous close
  
  PR:		kern/99188

Modified:
  stable/10/sys/netinet/tcp_input.c

Modified: stable/10/sys/netinet/tcp_input.c
==============================================================================
--- stable/10/sys/netinet/tcp_input.c	Tue Jan  7 22:59:33 2014	(r260416)
+++ stable/10/sys/netinet/tcp_input.c	Tue Jan  7 23:00:58 2014	(r260417)
@@ -2429,13 +2429,15 @@ tcp_do_segment(struct mbuf *m, struct tc
 		hhook_run_tcp_est_in(tp, th, &to);
 
 		if (SEQ_LEQ(th->th_ack, tp->snd_una)) {
-			if (tlen == 0 && tiwin == tp->snd_wnd) {
+			if (tlen == 0 && tiwin == tp->snd_wnd &&
+			    !(thflags & TH_FIN)) {
 				TCPSTAT_INC(tcps_rcvdupack);
 				/*
 				 * If we have outstanding data (other than
 				 * a window probe), this is a completely
 				 * duplicate ack (ie, window info didn't
-				 * change), the ack is the biggest we've
+				 * change and FIN isn't set),
+				 * the ack is the biggest we've
 				 * seen and we've seen exactly our rexmt
 				 * threshhold of them, assume a packet
 				 * has been dropped and retransmit it.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401072300.s07N0x2b040145>