xnu-2422.115.4.tar.gz

[apple/xnu.git] / bsd / netinet / tcp_output.c

diff --git a/bsd/netinet/tcp_output.c b/bsd/netinet/tcp_output.c
index 8c58a9bfc9d227423c7fefc694601e11a32175da..fa6e5348c0337aeb7847d37e17a534a230bba4c5 100644 (file)
--- a/bsd/netinet/tcp_output.c
+++ b/bsd/netinet/tcp_output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2014 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -854,6 +854,7 @@ after_sack_rexmit:
 
        recwin = tcp_sbspace(tp);
 
+
        /*
         * If the socket is capable of doing unordered send,
         * pull the amount of data that can be sent from the
@@ -992,8 +993,8 @@ after_sack_rexmit:
         * If our state indicates that FIN should be sent
         * and we have not yet done so, then we need to send.
         */
-       if (flags & TH_FIN &&
-           ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una))
+       if ((flags & TH_FIN) &&
+           (!(tp->t_flags & TF_SENTFIN) || tp->snd_nxt == tp->snd_una))
                goto send;
        /*
         * In SACK, it is possible for tcp_output to fail to send a segment
@@ -1800,7 +1801,8 @@ send:
                if (flags & (TH_SYN|TH_FIN)) {
                        if (flags & TH_SYN)
                                tp->snd_nxt++;
-                       if (flags & TH_FIN) {
+                       if ((flags & TH_FIN) && 
+                               !(tp->t_flags & TF_SENTFIN)) {
                                tp->snd_nxt++;
                                tp->t_flags |= TF_SENTFIN;
                        }
@@ -1832,7 +1834,8 @@ send:
 timer:
                if (tp->t_timer[TCPT_REXMT] == 0 &&
                    ((sack_rxmit && tp->snd_nxt != tp->snd_max) ||
-                       tp->snd_nxt != tp->snd_una)) {
+                       tp->snd_nxt != tp->snd_una ||
+                       (flags & TH_FIN))) {
                        if (tp->t_timer[TCPT_PERSIST]) {
                                tp->t_timer[TCPT_PERSIST] = 0;
                                tp->t_rxtshift = 0;
@@ -1849,7 +1852,8 @@ timer:
                int xlen = len;
                if (flags & TH_SYN)
                        ++xlen;
-               if (flags & TH_FIN) {
+               if ((flags & TH_FIN) && 
+                       !(tp->t_flags & TF_SENTFIN)) {
                        ++xlen;
                        tp->t_flags |= TF_SENTFIN;
                }