review

quinn-proto/src/connection/datagrams.rs

@@ -19,11 +19,12 @@ pub struct Datagrams<'a> {
 impl<'a> Datagrams<'a> {
     /// Queue an unreliable, unordered datagram for immediate transmission
     ///
-    /// If `drop` is true, previously queued datagrams which are still unsent will be discarded to
-    /// make space for this datagram. If `drop` is false, and there isn't enough space due to
-    /// previously queued datagrams, this function will return `SendDatagramError::Blocked`
-    ///
     /// Returns `Err` iff a `len`-byte datagram cannot currently be sent
+    ///
+    /// If `drop` is true, previously queued datagrams which are still unsent may be discarded to
+    /// make space for this datagram, in order of oldest to newest. If `drop` is false, and there
+    /// isn't enough space due to previously queued datagrams, this function will return
+    /// `SendDatagramError::Blocked`.
     pub fn send(&mut self, data: Bytes, drop: bool) -> Result<(), SendDatagramError> {
         if self.conn.config.datagram_receive_buffer_size.is_none() {
             return Err(SendDatagramError::Disabled);
@@ -153,7 +154,6 @@ impl DatagramState {
         }
 
         self.outgoing_total -= datagram.data.len();
-        self.send_blocked = false;
         datagram.encode(true, buf);
         true
     }

quinn-proto/src/connection/mod.rs

@@ -3095,7 +3095,6 @@ impl Connection {
         }
 
         // DATAGRAM
-        let datagram_send_was_blocked = self.datagrams.send_blocked;
         let mut sent_datagrams = false;
         while buf.len() + Datagram::SIZE_BOUND < max_size && space_id == SpaceId::Data {
             match self.datagrams.write(buf, max_size) {
@@ -3107,8 +3106,9 @@ impl Connection {
                 false => break,
             }
         }
-        if datagram_send_was_blocked && sent_datagrams {
+        if self.datagrams.send_blocked && sent_datagrams {
             self.events.push_back(Event::DatagramSent);
+            self.datagrams.send_blocked = false;
         }
 
         // STREAM