summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_input.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2014-01-07 23:00:58 +0000
committerpeter <peter@FreeBSD.org>2014-01-07 23:00:58 +0000
commit16f467cacd9531b98ef3bdb9c5aebd852492b946 (patch)
tree587d1013f20dbbeec8183f72d4b990e9cec840f0 /sys/netinet/tcp_input.c
parentbe72cc437326f10825234aacc2959c78ac87f1ee (diff)
downloadFreeBSD-src-16f467cacd9531b98ef3bdb9c5aebd852492b946.zip
FreeBSD-src-16f467cacd9531b98ef3bdb9c5aebd852492b946.tar.gz
MFC r258821 - fix tcp simultaneous close
PR: kern/99188
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r--sys/netinet/tcp_input.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 36a665a..e486fcf 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2429,13 +2429,15 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
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.
OpenPOWER on IntegriCloud