Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite congestion and recovery code #1490

Closed
wants to merge 1 commit into from
Closed

Rewrite congestion and recovery code #1490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions apps/src/bin/quiche-server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,8 @@ fn main() {
client.loss_rate = loss_rate;
}

let max_send_burst =
client.conn.send_quantum().min(client.max_send_burst) /
client.max_datagram_size *
client.max_datagram_size;
let max_send_burst = client.max_send_burst / client.max_datagram_size *
client.max_datagram_size;
let mut total_write = 0;
let mut dst_info = None;

Expand Down
4 changes: 3 additions & 1 deletion apps/src/sendto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ fn send_to_gso_pacing(
use nix::sys::socket::SockaddrStorage;
use std::io::IoSlice;
use std::os::unix::io::AsRawFd;
use std::time::Instant;

let iov = [IoSlice::new(buf)];
let segment_size = segment_size as u16;
Expand All @@ -69,7 +70,8 @@ fn send_to_gso_pacing(
let cmsg_gso = ControlMessage::UdpGsoSegments(&segment_size);

// Pacing option.
let send_time = std_time_to_u64(&send_info.at);
let now = Instant::now();
let send_time = std_time_to_u64(&send_info.release.time(now).unwrap_or(now));
let cmsg_txtime = ControlMessage::TxTime(&send_time);

match sendmsg(
Expand Down
3 changes: 3 additions & 0 deletions quiche/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git-blame.gitWebUrl": ""
}
1 change: 1 addition & 0 deletions quiche/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ intrusive-collections = "0.9.5"
qlog = { version = "0.9", path = "../qlog", optional = true }
sfv = { version = "0.9", optional = true }
smallvec = { version = "1.10", features = ["serde", "union"] }
enum_dispatch = "0.3"

[target."cfg(windows)".dependencies]
winapi = { version = "0.3", features = ["wincrypt", "ws2def", "ws2ipdef", "ws2tcpip"] }
Expand Down
Loading