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

Jump to bottom

Fix missing re-exports #2031

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Fix missing re-exports #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
974f324
proto: Rename frame::Type to FrameType
gretchenfrage Nov 9, 2024
953db94
proto: Fix missing re-exports
gretchenfrage Nov 9, 2024
2a9450c
quinn: Fix missing re-exports
gretchenfrage Nov 9, 2024
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
20 changes: 10 additions & 10 deletions quinn-proto/src/connection/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ impl Connection {
self,
)?;
trace!("validating previous path with PATH_CHALLENGE {:08x}", token);
buf.write(frame::Type::PATH_CHALLENGE);
buf.write(frame::FrameType::PATH_CHALLENGE);
buf.write(token);
self.stats.frame_tx.path_challenge += 1;

Expand Down Expand Up @@ -883,7 +883,7 @@ impl Connection {
// above.
let mut builder = builder_storage.take().unwrap();
trace!("PATH_RESPONSE {:08x} (off-path)", token);
buf.write(frame::Type::PATH_RESPONSE);
buf.write(frame::FrameType::PATH_RESPONSE);
buf.write(token);
self.stats.frame_tx.path_response += 1;
builder.pad_to(MIN_INITIAL_SIZE);
Expand Down Expand Up @@ -979,12 +979,12 @@ impl Connection {
)?;

// We implement MTU probes as ping packets padded up to the probe size
buf.write(frame::Type::PING);
buf.write(frame::FrameType::PING);
self.stats.frame_tx.ping += 1;

// If supported by the peer, we want no delays to the probe's ACK
if self.peer_supports_ack_frequency() {
buf.write(frame::Type::IMMEDIATE_ACK);
buf.write(frame::FrameType::IMMEDIATE_ACK);
self.stats.frame_tx.immediate_ack += 1;
}

Expand Down Expand Up @@ -3037,7 +3037,7 @@ impl Connection {

// HANDSHAKE_DONE
if !is_0rtt && mem::replace(&mut space.pending.handshake_done, false) {
buf.write(frame::Type::HANDSHAKE_DONE);
buf.write(frame::FrameType::HANDSHAKE_DONE);
sent.retransmits.get_or_create().handshake_done = true;
// This is just a u8 counter and the frame is typically just sent once
self.stats.frame_tx.handshake_done =
Expand All @@ -3047,15 +3047,15 @@ impl Connection {
// PING
if mem::replace(&mut space.ping_pending, false) {
trace!("PING");
buf.write(frame::Type::PING);
buf.write(frame::FrameType::PING);
sent.non_retransmits = true;
self.stats.frame_tx.ping += 1;
}

// IMMEDIATE_ACK
if mem::replace(&mut space.immediate_ack_pending, false) {
trace!("IMMEDIATE_ACK");
buf.write(frame::Type::IMMEDIATE_ACK);
buf.write(frame::FrameType::IMMEDIATE_ACK);
sent.non_retransmits = true;
self.stats.frame_tx.immediate_ack += 1;
}
Expand Down Expand Up @@ -3111,7 +3111,7 @@ impl Connection {
sent.non_retransmits = true;
sent.requires_padding = true;
trace!("PATH_CHALLENGE {:08x}", token);
buf.write(frame::Type::PATH_CHALLENGE);
buf.write(frame::FrameType::PATH_CHALLENGE);
buf.write(token);
self.stats.frame_tx.path_challenge += 1;
}
Expand All @@ -3123,7 +3123,7 @@ impl Connection {
sent.non_retransmits = true;
sent.requires_padding = true;
trace!("PATH_RESPONSE {:08x}", token);
buf.write(frame::Type::PATH_RESPONSE);
buf.write(frame::FrameType::PATH_RESPONSE);
buf.write(token);
self.stats.frame_tx.path_response += 1;
}
Expand Down Expand Up @@ -3210,7 +3210,7 @@ impl Connection {
None => break,
};
trace!(sequence = seq, "RETIRE_CONNECTION_ID");
buf.write(frame::Type::RETIRE_CONNECTION_ID);
buf.write(frame::FrameType::RETIRE_CONNECTION_ID);
buf.write_var(seq);
sent.retransmits.get_or_create().retire_cids.push(seq);
self.stats.frame_tx.retire_connection_id += 1;
Expand Down
8 changes: 4 additions & 4 deletions quinn-proto/src/connection/streams/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ impl StreamsState {
}

retransmits.get_or_create().max_data = true;
buf.write(frame::Type::MAX_DATA);
buf.write(frame::FrameType::MAX_DATA);
buf.write(max);
stats.max_data += 1;
}
Expand Down Expand Up @@ -508,7 +508,7 @@ impl StreamsState {
rs.record_sent_max_stream_data(max);

trace!(stream = %id, max = max, "MAX_STREAM_DATA");
buf.write(frame::Type::MAX_STREAM_DATA);
buf.write(frame::FrameType::MAX_STREAM_DATA);
buf.write(id);
buf.write_var(max);
stats.max_stream_data += 1;
Expand All @@ -529,8 +529,8 @@ impl StreamsState {
dir
);
buf.write(match dir {
Dir::Uni => frame::Type::MAX_STREAMS_UNI,
Dir::Bi => frame::Type::MAX_STREAMS_BIDI,
Dir::Uni => frame::FrameType::MAX_STREAMS_UNI,
Dir::Bi => frame::FrameType::MAX_STREAMS_BIDI,
});
buf.write_var(self.max_remote[dir as usize]);
match dir {
Expand Down
Loading