proto: make now explicit for Endpoint::connect()

quinn-rs · Aug 25, 2023 · 307d80b · 307d80b
1 parent c2a54b9
commit 307d80b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/quinn-proto/src/endpoint.rs b/quinn-proto/src/endpoint.rs
@@ -312,6 +312,7 @@ impl Endpoint {
     /// Initiate a connection
     pub fn connect(
         &mut self,
+        now: Instant,
         config: ClientConfig,
         remote: SocketAddr,
         server_name: &str,
@@ -352,7 +353,7 @@ impl Endpoint {
                 remote,
                 local_ip: None,
             },
-            Instant::now(),
+            now,
             tls,
             None,
             config.transport,

diff --git a/quinn-proto/src/tests/mod.rs b/quinn-proto/src/tests/mod.rs
@@ -65,7 +65,7 @@ fn version_negotiate_client() {
         true,
     );
     let (_, mut client_ch) = client
-        .connect(client_config(), server_addr, "localhost")
+        .connect(Instant::now(), client_config(), server_addr, "localhost")
         .unwrap();
     let now = Instant::now();
     let opt_event = client.handle(

diff --git a/quinn-proto/src/tests/util.rs b/quinn-proto/src/tests/util.rs
@@ -201,7 +201,7 @@ impl Pair {
         let _guard = span.enter();
         let (client_ch, client_conn) = self
             .client
-            .connect(config, self.server.addr, "localhost")
+            .connect(Instant::now(), config, self.server.addr, "localhost")
             .unwrap();
         self.client.connections.insert(client_ch, client_conn);
         client_ch

diff --git a/quinn/src/endpoint.rs b/quinn/src/endpoint.rs
@@ -186,7 +186,11 @@ impl Endpoint {
         } else {
             addr
         };
-        let (ch, conn) = endpoint.inner.connect(config, addr, server_name)?;
+
+        let (ch, conn) = endpoint
+            .inner
+            .connect(Instant::now(), config, addr, server_name)?;
+
         let socket = endpoint.socket.clone();
         Ok(endpoint
             .connections