Send a challenge ACK in response to an unacceptable TCP ACK.

whitequark · whitequark · commit 9f4165988cc7 · 2017-09-08T00:06:31.000Z
diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
@@ -734,19 +734,20 @@ impl<'a> TcpSocket<'a> {
             // Every acknowledgement must be for transmitted but unacknowledged data.
             (_, &TcpRepr { ack_number: Some(ack_number), .. }) => {
                 let unacknowledged = self.tx_buffer.len() + control_len;
+
                 if ack_number < self.local_seq_no {
                     net_debug!("[{}]{}:{}: duplicate ACK ({} not in {}...{})",
                                self.debug_id, self.local_endpoint, self.remote_endpoint,
                                ack_number, self.local_seq_no, self.local_seq_no + unacknowledged);
-                    // FIXME: instead of waiting for the retransmit timer to kick in,
-                    // reset it here.
+                    // FIXME: implement fast retransmit
                     return Err(Error::Dropped)
                 }
+
                 if ack_number > self.local_seq_no + unacknowledged {
                     net_debug!("[{}]{}:{}: unacceptable ACK ({} not in {}...{})",
                                self.debug_id, self.local_endpoint, self.remote_endpoint,
                                ack_number, self.local_seq_no, self.local_seq_no + unacknowledged);
-                    return Err(Error::Dropped)
+                    return Ok(Some(self.ack_reply(ip_repr, &repr)))
                 }
             }
         }
@@ -2903,6 +2904,20 @@ mod test {
         }));
     }
 
+    #[test]
+    fn test_unacceptable_ack_challenge_ack() {
+        let mut s = socket_established();
+        send!(s, TcpRepr {
+            seq_number: REMOTE_SEQ + 1,
+            ack_number: Some(LOCAL_SEQ + 1 + 1),
+            ..SEND_TEMPL
+        }, Ok(Some(TcpRepr {
+            seq_number: LOCAL_SEQ + 1,
+            ack_number: Some(REMOTE_SEQ + 1),
+            ..RECV_TEMPL
+        })));
+    }
+
     #[test]
     fn test_fill_peer_window() {
         let mut s = socket_established();
