From 5e48567297f90666148f038e4c7831e03f16357a Mon Sep 17 00:00:00 2001
From: whitequark <pz@m-labs.hk>
Date: Wed, 30 Aug 2017 23:09:31 +0000
Subject: [PATCH] Send a TCP ACK after window increases from zero to non-zero.

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

diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
index f10cf5d..bc907f0 100644
--- a/src/socket/tcp.rs
+++ b/src/socket/tcp.rs
@@ -624,6 +624,12 @@ impl<'a> TcpSocket<'a> {
         // another (stale) SYN.
         if !self.may_recv() { return Err(Error::Illegal) }
 
+        // If we advertised a zero window, make sure to send an ACK so that the peer
+        // can resume sending data.
+        if self.rx_buffer.window() == 0 {
+            self.remote_last_ack = None;
+        }
+
         #[cfg(any(test, feature = "verbose"))]
         let old_length = self.rx_buffer.len();
         let buffer = self.rx_buffer.dequeue(size);
@@ -2962,4 +2968,29 @@ mod test {
             ..RECV_TEMPL
         })));
     }
+
+    #[test]
+    fn test_zero_window_ack_on_window_growth() {
+        let mut s = socket_established();
+        s.rx_buffer = SocketBuffer::new(vec![0; 6]);
+        send!(s, TcpRepr {
+            seq_number: REMOTE_SEQ + 1,
+            ack_number: Some(LOCAL_SEQ + 1),
+            payload:    &b"abcdef"[..],
+            ..SEND_TEMPL
+        }, Ok(Some(TcpRepr {
+            seq_number: LOCAL_SEQ + 1,
+            ack_number: Some(REMOTE_SEQ + 1 + 6),
+            window_len: 0,
+            ..RECV_TEMPL
+        })));
+        recv!(s, time 0, Err(Error::Exhausted));
+        assert_eq!(s.recv(6), Ok(&b"abcdef"[..]));
+        recv!(s, time 0, Ok(TcpRepr {
+            seq_number: LOCAL_SEQ + 1,
+            ack_number: Some(REMOTE_SEQ + 1 + 6),
+            window_len: 6,
+            ..RECV_TEMPL
+        }));
+    }
 }