From 5cc3a520883d5ee53661e22db2afb139c83d9fbc Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Thu, 28 Mar 2019 17:22:57 -0700 Subject: [PATCH] Cosmetic cleanup --- quinn-proto/src/connection.rs | 2 +- quinn-proto/src/stream.rs | 4 ++-- quinn/src/connection.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quinn-proto/src/connection.rs b/quinn-proto/src/connection.rs index 55b37b1ef..cf663a5dc 100644 --- a/quinn-proto/src/connection.rs +++ b/quinn-proto/src/connection.rs @@ -2825,7 +2825,7 @@ impl Connection { debug_assert!(self.side.is_client()); debug!(self.log, "0-RTT rejected"); self.accepted_0rtt = false; - self.streams.reset(self.side); + self.streams.zero_rtt_rejected(self.side); // Discard already-queued frames self.space_mut(SpaceId::Data).pending = Retransmits::default(); // Discard 0-RTT packets diff --git a/quinn-proto/src/stream.rs b/quinn-proto/src/stream.rs index 3b50f0d0c..82bcf4cc9 100644 --- a/quinn-proto/src/stream.rs +++ b/quinn-proto/src/stream.rs @@ -117,8 +117,8 @@ impl Streams { } } - pub fn reset(&mut self, side: Side) { - // Reset all outgoing streams + pub fn zero_rtt_rejected(&mut self, side: Side) { + // Revert to initial state for outgoing streams for i in 0..self.next_bi { self.streams .remove(&StreamId::new(side, Directionality::Bi, i)) diff --git a/quinn/src/connection.rs b/quinn/src/connection.rs index 8771e7bfd..1e3648378 100644 --- a/quinn/src/connection.rs +++ b/quinn/src/connection.rs @@ -764,7 +764,7 @@ impl io::Read for BiStream { )), Err(UnknownStream) => Err(io::Error::new( io::ErrorKind::ConnectionAborted, - "unknown stream".to_string(), + "unknown stream", )), } }