Skip to content

Commit

Permalink
Merge branch 'main' into test-cargo-fuzz
Browse files Browse the repository at this point in the history
  • Loading branch information
larseggert authored Apr 5, 2024
2 parents f0783df + 5dfe106 commit e7beafb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resolver = "2"
homepage = "https://github.com/mozilla/neqo/"
repository = "https://github.com/mozilla/neqo/"
authors = ["The Neqo Authors <[email protected]>"]
version = "0.7.2"
version = "0.7.3"
# Keep in sync with `.rustfmt.toml` `edition`.
edition = "2021"
license = "MIT OR Apache-2.0"
Expand Down
6 changes: 2 additions & 4 deletions neqo-http3/src/connection_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use std::{
cell::RefCell,
fmt::{Debug, Display},
mem,
iter, mem,
net::SocketAddr,
rc::Rc,
time::Instant,
Expand Down Expand Up @@ -874,9 +874,7 @@ impl Http3Client {
///
/// [1]: ../neqo_transport/enum.ConnectionEvent.html
pub fn process_input(&mut self, dgram: &Datagram, now: Instant) {
qtrace!([self], "Process input.");
self.conn.process_input(dgram, now);
self.process_http3(now);
self.process_multiple_input(iter::once(dgram), now);
}

pub fn process_multiple_input<'a, I>(&mut self, dgrams: I, now: Instant)
Expand Down
6 changes: 2 additions & 4 deletions neqo-transport/src/connection/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{
cell::RefCell,
cmp::{max, min},
fmt::{self, Debug},
mem,
iter, mem,
net::{IpAddr, SocketAddr},
ops::RangeInclusive,
rc::{Rc, Weak},
Expand Down Expand Up @@ -978,9 +978,7 @@ impl Connection {

/// Process new input datagrams on the connection.
pub fn process_input(&mut self, d: &Datagram, now: Instant) {
self.input(d, now, now);
self.process_saved(now);
self.streams.cleanup_closed_streams();
self.process_multiple_input(iter::once(d), now);
}

/// Process new input datagrams on the connection.
Expand Down

0 comments on commit e7beafb

Please sign in to comment.