Add an build method to the TransmitBuilder

Author: flub

quinn-proto/src/connection/mod.rs

@@ -964,20 +964,12 @@ impl Connection {
             .udp_tx
             .on_sent(transmit.num_datagrams() as u64, transmit.len());
 
-        Some(Transmit {
-            destination: self.path.remote,
-            size: transmit.len(),
-            ecn: if self.path.sending_ecn {
-                Some(EcnCodepoint::Ect0)
-            } else {
-                None
-            },
-            segment_size: match transmit.num_datagrams() {
-                1 => None,
-                _ => Some(transmit.segment_size()),
-            },
-            src_ip: self.local_ip,
-        })
+        let ecn = if self.path.sending_ecn {
+            Some(EcnCodepoint::Ect0)
+        } else {
+            None
+        };
+        Some(transmit.build(self.path.remote, ecn, self.local_ip))
     }
 
     /// Send PATH_CHALLENGE for a previous path if necessary

quinn-proto/src/connection/transmit_builder.rs

@@ -1,7 +1,10 @@
+use std::net::{IpAddr, SocketAddr};
 use std::ops::{Deref, DerefMut};
 
 use bytes::BufMut;
 
+use crate::{EcnCodepoint, Transmit};
+
 /// The buffer in which to write datagrams for [`Connection::poll_transmit`]
 ///
 /// The `poll_transmit` function writes zero or more datagrams to a buffer. Multiple
@@ -155,6 +158,24 @@ impl<'a> TransmitBuilder<'a> {
         )
     }
 
+    pub(super) fn build(
+        self,
+        destination: SocketAddr,
+        ecn: Option<EcnCodepoint>,
+        src_ip: Option<IpAddr>,
+    ) -> Transmit {
+        Transmit {
+            destination,
+            ecn,
+            size: self.len(),
+            segment_size: match self.num_datagrams {
+                1 => None,
+                _ => Some(self.segment_size),
+            },
+            src_ip,
+        }
+    }
+
     /// Returns the bytes written into the current datagram
     pub(super) fn datagram(&self) -> &[u8] {
         &self.buf[self.datagram_start..]