Skip to content

Commit 8c66491

Browse files
gretchenfrageRalith
authored andcommitted
proto: Rename frame::Type to FrameType
quic_proto::frame::Type should be publically re-exported. This commit renames the it to a name more befitting of a public type.
1 parent 18b7956 commit 8c66491

File tree

4 files changed

+90
-90
lines changed

4 files changed

+90
-90
lines changed

Diff for: quinn-proto/src/connection/mod.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ impl Connection {
501501
self,
502502
)?;
503503
trace!("validating previous path with PATH_CHALLENGE {:08x}", token);
504-
buf.write(frame::Type::PATH_CHALLENGE);
504+
buf.write(frame::FrameType::PATH_CHALLENGE);
505505
buf.write(token);
506506
self.stats.frame_tx.path_challenge += 1;
507507

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

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

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

@@ -3037,7 +3037,7 @@ impl Connection {
30373037

30383038
// HANDSHAKE_DONE
30393039
if !is_0rtt && mem::replace(&mut space.pending.handshake_done, false) {
3040-
buf.write(frame::Type::HANDSHAKE_DONE);
3040+
buf.write(frame::FrameType::HANDSHAKE_DONE);
30413041
sent.retransmits.get_or_create().handshake_done = true;
30423042
// This is just a u8 counter and the frame is typically just sent once
30433043
self.stats.frame_tx.handshake_done =
@@ -3047,15 +3047,15 @@ impl Connection {
30473047
// PING
30483048
if mem::replace(&mut space.ping_pending, false) {
30493049
trace!("PING");
3050-
buf.write(frame::Type::PING);
3050+
buf.write(frame::FrameType::PING);
30513051
sent.non_retransmits = true;
30523052
self.stats.frame_tx.ping += 1;
30533053
}
30543054

30553055
// IMMEDIATE_ACK
30563056
if mem::replace(&mut space.immediate_ack_pending, false) {
30573057
trace!("IMMEDIATE_ACK");
3058-
buf.write(frame::Type::IMMEDIATE_ACK);
3058+
buf.write(frame::FrameType::IMMEDIATE_ACK);
30593059
sent.non_retransmits = true;
30603060
self.stats.frame_tx.immediate_ack += 1;
30613061
}
@@ -3111,7 +3111,7 @@ impl Connection {
31113111
sent.non_retransmits = true;
31123112
sent.requires_padding = true;
31133113
trace!("PATH_CHALLENGE {:08x}", token);
3114-
buf.write(frame::Type::PATH_CHALLENGE);
3114+
buf.write(frame::FrameType::PATH_CHALLENGE);
31153115
buf.write(token);
31163116
self.stats.frame_tx.path_challenge += 1;
31173117
}
@@ -3123,7 +3123,7 @@ impl Connection {
31233123
sent.non_retransmits = true;
31243124
sent.requires_padding = true;
31253125
trace!("PATH_RESPONSE {:08x}", token);
3126-
buf.write(frame::Type::PATH_RESPONSE);
3126+
buf.write(frame::FrameType::PATH_RESPONSE);
31273127
buf.write(token);
31283128
self.stats.frame_tx.path_response += 1;
31293129
}
@@ -3210,7 +3210,7 @@ impl Connection {
32103210
None => break,
32113211
};
32123212
trace!(sequence = seq, "RETIRE_CONNECTION_ID");
3213-
buf.write(frame::Type::RETIRE_CONNECTION_ID);
3213+
buf.write(frame::FrameType::RETIRE_CONNECTION_ID);
32143214
buf.write_var(seq);
32153215
sent.retransmits.get_or_create().retire_cids.push(seq);
32163216
self.stats.frame_tx.retire_connection_id += 1;

Diff for: quinn-proto/src/connection/streams/state.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ impl StreamsState {
478478
}
479479

480480
retransmits.get_or_create().max_data = true;
481-
buf.write(frame::Type::MAX_DATA);
481+
buf.write(frame::FrameType::MAX_DATA);
482482
buf.write(max);
483483
stats.max_data += 1;
484484
}
@@ -508,7 +508,7 @@ impl StreamsState {
508508
rs.record_sent_max_stream_data(max);
509509

510510
trace!(stream = %id, max = max, "MAX_STREAM_DATA");
511-
buf.write(frame::Type::MAX_STREAM_DATA);
511+
buf.write(frame::FrameType::MAX_STREAM_DATA);
512512
buf.write(id);
513513
buf.write_var(max);
514514
stats.max_stream_data += 1;
@@ -529,8 +529,8 @@ impl StreamsState {
529529
dir
530530
);
531531
buf.write(match dir {
532-
Dir::Uni => frame::Type::MAX_STREAMS_UNI,
533-
Dir::Bi => frame::Type::MAX_STREAMS_BIDI,
532+
Dir::Uni => frame::FrameType::MAX_STREAMS_UNI,
533+
Dir::Bi => frame::FrameType::MAX_STREAMS_BIDI,
534534
});
535535
buf.write_var(self.max_remote[dir as usize]);
536536
match dir {

0 commit comments

Comments
 (0)