change init_rtt after path receive PATH_RESPONSE frame

Tencent · Jul 25, 2024 · ae8585a · ae8585a
1 parent cb94ce6
commit ae8585a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/connection/path.rs b/src/connection/path.rs
@@ -19,6 +19,7 @@ use std::net::IpAddr;
 use std::net::SocketAddr;
 use std::time;
 use std::time::Duration;
+use std::time::Instant;
 
 use slab::Slab;
 
@@ -70,7 +71,7 @@ pub struct Path {
     recv_chals: VecDeque<[u8; 8]>,
 
     /// Pending challenge data with the size of the packet containing them.
-    sent_chals: VecDeque<([u8; 8], usize, time::Instant)>,
+    sent_chals: VecDeque<([u8; 8], usize, time::Instant, time::Instant)>,
 
     /// Whether it requires sending PATH_CHALLENGE?
     need_send_challenge: bool,
@@ -190,9 +191,13 @@ impl Path {
 
         // The 4-tuple is reachable, but we didn't check Path MTU yet.
         let mut challenge_size = 0;
-        self.sent_chals.retain(|(d, s, _)| {
+        self.sent_chals.retain(|(d, s, st, _)| {
             if *d == data {
                 challenge_size = *s;
+                let chal_sent_time = *st;
+                let now = Instant::now();
+                let path_init_rtt = now.duration_since(chal_sent_time);
+                self.recovery.rtt.set_init_rtt(path_init_rtt);
                 false
             } else {
                 true
@@ -243,7 +248,7 @@ impl Path {
         let loss_time =
             sent_time + time::Duration::from_millis(INITIAL_CHAL_TIMEOUT << self.lost_chal);
 
-        self.sent_chals.push_back((data, pkt_size, loss_time));
+        self.sent_chals.push_back((data, pkt_size, sent_time, loss_time));
     }
 
     /// Handle timeout of PATH_CHALLENGE
@@ -254,7 +259,7 @@ impl Path {
 
         // Remove the lost challenges.
         while let Some(first_chal) = self.sent_chals.front() {
-            if first_chal.2 > now {
+            if first_chal.3 > now {
                 return;
             }
 
@@ -563,8 +568,8 @@ impl PathMap {
         self.paths
             .iter()
             .filter_map(|(_, p)| p.sent_chals.front())
-            .min_by_key(|&(_, _, loss_time)| loss_time)
-            .map(|&(_, _, loss_time)| loss_time)
+            .min_by_key(|&(_, _, _, loss_time)| loss_time)
+            .map(|&(_, _, _, loss_time)| loss_time)
     }
 
     /// Return the maximum PTO among all paths.

diff --git a/src/connection/rtt.rs b/src/connection/rtt.rs
@@ -81,6 +81,16 @@ impl RttEstimator {
         self.smoothed_rtt() + cmp::max(4 * self.rttvar, TIMER_GRANULARITY)
     }
 
+    /// Set initial RTT when receive PATH_RESPONSE frame
+    pub fn set_init_rtt(&mut self, init_rtt: Duration) {
+
+        self.latest_rtt = init_rtt;
+        self.smoothed_rtt = Some(init_rtt);
+        self.rttvar = init_rtt / 2;
+        self.min_rtt = init_rtt;
+        self.max_rtt = init_rtt;
+    }
+
     /// Update estimator with the given RTT sample
     pub fn update(&mut self, ack_delay: Duration, rtt: Duration) {
         self.latest_rtt = rtt;