commit 74458c6db64aa50b01314ac8a2fa3e2394c7965c
author Alessandro Ghedini <alessandro@ghedini.me> Mon Jun 29 16:50:54 2020 +0100
committer Alessandro Ghedini <alessandro@ghedini.me> Mon Jul 13 16:09:09 2020 +0100
tree 4fadc3243e19d61fc4a95555b376233c341c6b27
parent 7c3d7b290588d096c20e32e54dd08e014ffc2df9

bundle ACK with PTO probes

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 196cca6..1cd9dd3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2085,7 +2085,10 @@
         let mut payload_len = 0;
 
         // Create ACK frame.
-        if self.pkt_num_spaces[epoch].ack_elicited && !is_closing {
+        if (self.pkt_num_spaces[epoch].ack_elicited ||
+            self.recovery.loss_probes[epoch] > 0) &&
+            !is_closing
+        {
             let ack_delay =
                 self.pkt_num_spaces[epoch].largest_rx_pkt_time.elapsed();
 
@@ -6989,8 +6992,13 @@
         let frames =
             testing::decode_pkt(&mut pipe.server, &mut buf, len).unwrap();
 
+        let mut iter = frames.iter();
+
+        // Skip ACK frame.
+        iter.next();
+
         assert_eq!(
-            frames.iter().next(),
+            iter.next(),
             Some(&frame::Frame::Stream {
                 stream_id: 4,
                 data: stream::RangeBuf::from(b"b", 0, false),