feat: ack receiver timestamps

quinn-proto/src/config.rs

@@ -52,6 +52,7 @@ pub struct TransportConfig {
     pub(crate) min_mtu: u16,
     pub(crate) mtu_discovery_config: Option<MtuDiscoveryConfig>,
     pub(crate) ack_frequency_config: Option<AckFrequencyConfig>,
+    pub(crate) ack_timestamps_config: AckTimestampsConfig,
 
     pub(crate) persistent_congestion_threshold: u32,
     pub(crate) keep_alive_interval: Option<Duration>,
@@ -223,6 +224,21 @@ impl TransportConfig {
         self
     }
 
+    /// Specifies the ACK timestamp config.
+    /// Defaults to `None`, which disables receiving acknowledgement timestamps from the sender.
+    /// If `Some`, TransportParameters are sent to the peer to enable acknowledgement timestamps
+    /// if supported.
+    pub fn max_ack_timestamps(&mut self, value: VarInt) -> &mut Self {
+        self.ack_timestamps_config.max_timestamps_per_ack = Some(value);
+        self
+    }
+
+    /// Specifies the exponent used when encoding the timestamps.
+    pub fn ack_timestamps_exponent(&mut self, value: VarInt) -> &mut Self {
+        self.ack_timestamps_config.exponent = value;
+        self
+    }
+
     /// Number of consecutive PTOs after which network is considered to be experiencing persistent congestion.
     pub fn persistent_congestion_threshold(&mut self, value: u32) -> &mut Self {
         self.persistent_congestion_threshold = value;
@@ -360,6 +376,8 @@ impl Default for TransportConfig {
             congestion_controller_factory: Arc::new(congestion::CubicConfig::default()),
 
             enable_segmentation_offload: true,
+
+            ack_timestamps_config: AckTimestampsConfig::default(),
         }
     }
 }
@@ -390,6 +408,7 @@ impl fmt::Debug for TransportConfig {
                 deterministic_packet_numbers: _,
             congestion_controller_factory: _,
             enable_segmentation_offload,
+            ack_timestamps_config,
         } = self;
         fmt.debug_struct("TransportConfig")
             .field("max_concurrent_bidi_streams", max_concurrent_bidi_streams)
@@ -416,10 +435,44 @@ impl fmt::Debug for TransportConfig {
             .field("datagram_send_buffer_size", datagram_send_buffer_size)
             .field("congestion_controller_factory", &"[ opaque ]")
             .field("enable_segmentation_offload", enable_segmentation_offload)
+            .field("ack_timestamps_config", ack_timestamps_config)
             .finish()
     }
 }
 
+/// Parameters for controlling the peer's acknowledgements with receiver timestamps.
+#[derive(Clone, Debug, PartialEq, Eq, Copy)]
+pub struct AckTimestampsConfig {
+    /// If max_timestamp_per_ack is None, this feature is disabled.
+    pub(crate) max_timestamps_per_ack: Option<VarInt>,
+    pub(crate) exponent: VarInt,
+}
+
+impl AckTimestampsConfig {
+    /// Sets the maximum number of timestamp entries per ACK frame.
+    pub fn max_timestamps_per_ack(&mut self, value: VarInt) -> &mut Self {
+        self.max_timestamps_per_ack = Some(value);
+        self
+    }
+
+    /// Timestamp values are divided by the exponent value provided. This reduces the size of the
+    /// VARINT for loss in precision. A exponent of 0 represents microsecond precision.
+    pub fn exponent(&mut self, value: VarInt) -> &mut Self {
+        self.exponent = value;
+        self
+    }
+}
+
+impl Default for AckTimestampsConfig {
+    fn default() -> Self {
+        Self {
+            max_timestamps_per_ack: None,
+            // Default to 0 as per draft.
+            exponent: 0u32.into(),
+        }
+    }
+}
+
 /// Parameters for controlling the peer's acknowledgement frequency
 ///
 /// The parameters provided in this config will be sent to the peer at the beginning of the

quinn-proto/src/congestion.rs

@@ -34,6 +34,21 @@ pub trait Controller: Send + Sync {
     ) {
     }
 
+    #[allow(unused_variables)]
+    /// Packet deliveries were confirmed with timestamps information.
+    fn on_ack_packet(
+        &mut self,
+        pn: u64,
+        now: Instant,
+        sent: Instant,
+        received: Option<Instant>,
+        bytes: u64,
+        app_limited: bool,
+        rtt: &RttEstimator,
+    ) {
+        self.on_ack(now, sent, bytes, app_limited, rtt);
+    }
+
     /// Packets are acked in batches, all with the same `now` argument. This indicates one of those batches has completed.
     #[allow(unused_variables)]
     fn on_end_acks(

quinn-proto/src/connection/mod.rs

@@ -18,10 +18,9 @@ use crate::{
     cid_generator::ConnectionIdGenerator,
     cid_queue::CidQueue,
     coding::BufMutExt,
-    config::{ServerConfig, TransportConfig},
+    config::{AckTimestampsConfig, ServerConfig, TransportConfig},
     crypto::{self, KeyPair, Keys, PacketKey},
-    frame,
-    frame::{Close, Datagram, FrameStruct},
+    frame::{self, Close, Datagram, FrameStruct},
     packet::{
         FixedLengthConnectionIdParser, Header, InitialHeader, InitialPacket, LongType, Packet,
         PacketNumber, PartialDecode, SpaceId,
@@ -65,7 +64,10 @@ use paths::{PathData, PathResponses};
 
 mod send_buffer;
 
-mod spaces;
+mod receiver_timestamps;
+pub(crate) use receiver_timestamps::{PacketTimestamp, ReceiverTimestamps};
+
+pub(crate) mod spaces;
 #[cfg(fuzzing)]
 pub use spaces::Retransmits;
 #[cfg(not(fuzzing))]
@@ -227,6 +229,10 @@ pub struct Connection {
     /// no outgoing application data.
     app_limited: bool,
 
+    // Ack Receive Timestamps
+    // The timestamp config of the peer.
+    ack_timestamps_cfg: AckTimestampsConfig,
+
     streams: StreamsState,
     /// Surplus remote CIDs for future use on new paths
     rem_cids: CidQueue,
@@ -238,6 +244,8 @@ pub struct Connection {
     stats: ConnectionStats,
     /// QUIC version used for the connection.
     version: u32,
+    /// Created at time instant.
+    epoch: Instant,
 }
 
 impl Connection {
@@ -337,6 +345,8 @@ impl Connection {
                 &TransportParameters::default(),
             )),
 
+            ack_timestamps_cfg: AckTimestampsConfig::default(),
+
             pto_count: 0,
 
             app_limited: false,
@@ -357,6 +367,7 @@ impl Connection {
             rng,
             stats: ConnectionStats::default(),
             version,
+            epoch: now,
         };
         if side.is_client() {
             // Kick off the connection
@@ -817,6 +828,8 @@ impl Connection {
                         &mut self.spaces[space_id],
                         buf,
                         &mut self.stats,
+                        self.ack_timestamps_cfg,
+                        self.epoch,
                     );
                 }
 
@@ -1343,6 +1356,7 @@ impl Connection {
         if ack.largest >= self.spaces[space].next_packet_number {
             return Err(TransportError::PROTOCOL_VIOLATION("unsent packet acked"));
         }
+
         let new_largest = {
             let space = &mut self.spaces[space];
             if space
@@ -1371,6 +1385,24 @@ impl Connection {
             }
         }
 
+        let timestamp_iter =
+            ack.timestamps_iter(self.epoch, self.config.ack_timestamps_config.exponent.0);
+        if let (Some(max), Some(iter)) = (
+            self.config.ack_timestamps_config.max_timestamps_per_ack,
+            timestamp_iter,
+        ) {
+            let packet_space = &mut self.spaces[space];
+            for (i, pkt) in iter.enumerate() {
+                if i > max.0 as usize {
+                    warn!("peer is sending more timestamps than max requested");
+                    break;
+                }
+                if let Some(sent_packet) = packet_space.get_mut_sent_packet(pkt.packet_number) {
+                    sent_packet.time_received = Some(pkt.timestamp);
+                }
+            }
+        }
+
         if newly_acked.is_empty() {
             return Ok(());
         }
@@ -1490,9 +1522,11 @@ impl Connection {
         if info.ack_eliciting && self.path.challenge.is_none() {
             // Only pass ACKs to the congestion controller if we are not validating the current
             // path, so as to ignore any ACKs from older paths still coming in.
-            self.path.congestion.on_ack(
+            self.path.congestion.on_ack_packet(
+                pn,
                 now,
                 info.time_sent,
+                info.time_received,
                 info.size.into(),
                 self.app_limited,
                 &self.path.rtt,
@@ -3047,6 +3081,8 @@ impl Connection {
                 space,
                 buf,
                 &mut self.stats,
+                self.ack_timestamps_cfg,
+                self.epoch,
             );
         }
 
@@ -3231,6 +3267,8 @@ impl Connection {
         space: &mut PacketSpace,
         buf: &mut Vec<u8>,
         stats: &mut ConnectionStats,
+        ack_timestamps_config: AckTimestampsConfig,
+        epoch: Instant,
     ) {
         debug_assert!(!space.pending_acks.ranges().is_empty());
 
@@ -3255,7 +3293,22 @@ impl Connection {
             delay_micros
         );
 
-        frame::Ack::encode(delay as _, space.pending_acks.ranges(), ecn, buf);
+        frame::Ack::encode(
+            delay as _,
+            space.pending_acks.ranges(),
+            ecn,
+            ack_timestamps_config.max_timestamps_per_ack.map(|max| {
+                (
+                    // Safety: If peer_timestamp_config is set, receiver_timestamps must be set.
+                    space.pending_acks.receiver_timestamps_as_ref().unwrap(),
+                    epoch,
+                    ack_timestamps_config.exponent.0,
+                    max.0,
+                )
+            }),
+            buf,
+        );
+
         stats.frame_tx.acks += 1;
     }
 
@@ -3309,6 +3362,12 @@ impl Connection {
         self.path.mtud.on_peer_max_udp_payload_size_received(
             u16::try_from(self.peer_params.max_udp_payload_size.into_inner()).unwrap_or(u16::MAX),
         );
+        self.ack_timestamps_cfg = params.ack_timestamps_cfg;
+        if let Some(max) = params.ack_timestamps_cfg.max_timestamps_per_ack {
+            for space in self.spaces.iter_mut() {
+                space.pending_acks.set_receiver_timestamp(max.0 as usize);
+            }
+        };
     }
 
     fn decrypt_packet(

quinn-proto/src/connection/packet_builder.rs

@@ -210,6 +210,8 @@ impl PacketBuilder {
             ack_eliciting,
             retransmits: sent.retransmits,
             stream_frames: sent.stream_frames,
+
+            time_received: None,
         };
 
         conn.path