From 9fbb5cfff18c56c5b2790602e19d1ca88c97c2e7 Mon Sep 17 00:00:00 2001
From: whitequark <pz@m-labs.hk>
Date: Wed, 25 Jan 2017 06:01:58 +0000
Subject: [PATCH] Fix the TCP ACK handling in FIN-WAIT-1 state with queued
 data.

---
 src/socket/tcp.rs | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
index adf0a6a..6618957 100644
--- a/src/socket/tcp.rs
+++ b/src/socket/tcp.rs
@@ -720,10 +720,12 @@ impl<'a> TcpSocket<'a> {
             }
 
             // ACK packets in FIN-WAIT-1 state change it to FIN-WAIT-2, if we've already
-            // sent everything in the transmit buffer.
+            // sent everything in the transmit buffer, and reset the retransmit timer.
             (State::FinWait1, TcpRepr { control: TcpControl::None, .. }) => {
                 if self.tx_buffer.empty() {
                     self.set_state(State::FinWait2);
+                } else {
+                    self.retransmit.reset();
                 }
             }
 
@@ -2196,4 +2198,45 @@ mod test {
             ..RECV_TEMPL
         }));
     }
+
+    #[test]
+    fn test_fin_wait_1_retransmit_reset_after_ack() {
+        let mut s = socket_established();
+        s.remote_win_len = 6;
+        s.send_slice(b"abcdef").unwrap();
+        s.send_slice(b"123456").unwrap();
+        s.send_slice(b"ABCDEF").unwrap();
+        s.close();
+        recv!(s, time 1000, Ok(TcpRepr {
+            seq_number: LOCAL_SEQ + 1,
+            ack_number: Some(REMOTE_SEQ + 1),
+            payload:    &b"abcdef"[..],
+            ..RECV_TEMPL
+        }));
+        send!(s, time 1005, TcpRepr {
+            seq_number: REMOTE_SEQ + 1,
+            ack_number: Some(LOCAL_SEQ + 1 + 6),
+            window_len: 6,
+            ..SEND_TEMPL
+        });
+        recv!(s, time 1010, Ok(TcpRepr {
+            seq_number: LOCAL_SEQ + 1 + 6,
+            ack_number: Some(REMOTE_SEQ + 1),
+            payload:    &b"123456"[..],
+            ..RECV_TEMPL
+        }));
+        send!(s, time 1015, TcpRepr {
+            seq_number: REMOTE_SEQ + 1,
+            ack_number: Some(LOCAL_SEQ + 1 + 6 + 6),
+            window_len: 6,
+            ..SEND_TEMPL
+        });
+        recv!(s, time 1020, Ok(TcpRepr {
+            control:    TcpControl::Fin,
+            seq_number: LOCAL_SEQ + 1 + 6 + 6,
+            ack_number: Some(REMOTE_SEQ + 1),
+            payload:    &b"ABCDEF"[..],
+            ..RECV_TEMPL
+        }));
+    }
 }