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

feat: Make reason_phrase a String #1862

Merged
merged 5 commits into from
May 2, 2024
+28 −29
Merged

feat: Make reason_phrase a String #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a63dfac
feat: Make `reason_phrase` a String
larseggert Apr 30, 2024
d664806
Fix clippy
larseggert Apr 30, 2024
e183594
Update neqo-transport/src/frame.rs
larseggert May 2, 2024
44c0447
Update neqo-transport/src/qlog.rs
larseggert May 2, 2024
f1dddab
Address code review
larseggert May 2, 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
1 change: 0 additions & 1 deletion neqo-transport/src/connection/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2804,7 +2804,6 @@ impl Connection {
reason_phrase,
} => {
self.stats.borrow_mut().frame_rx.connection_close += 1;
let reason_phrase = String::from_utf8_lossy(&reason_phrase);
qinfo!(
[self],
"ConnectionClose received. Error code: {:?} frame type {:x} reason {}",
Expand Down
8 changes: 4 additions & 4 deletions neqo-transport/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ pub enum Frame<'a> {
frame_type: u64,
// Not a reference as we use this to hold the value.
// This is not used in optimized builds anyway.
reason_phrase: Vec<u8>,
reason_phrase: String,
},
HandshakeDone,
AckFrequency {
Expand Down Expand Up @@ -614,7 +614,7 @@ impl<'a> Frame<'a> {
0
};
// We can tolerate this copy for now.
let reason_phrase = d(dec.decode_vvec())?.to_vec();
let reason_phrase = String::from_utf8_lossy(d(dec.decode_vvec())?).to_string();
Ok(Self::ConnectionClose {
error_code,
frame_type,
Expand Down Expand Up @@ -925,7 +925,7 @@ mod tests {
let f = Frame::ConnectionClose {
error_code: CloseError::Transport(0x5678),
frame_type: 0x1234,
reason_phrase: vec![0x01, 0x02, 0x03],
reason_phrase: String::from("\x01\x02\x03"),
};

just_dec(&f, "1c80005678523403010203");
Expand All @@ -936,7 +936,7 @@ mod tests {
let f = Frame::ConnectionClose {
error_code: CloseError::Application(0x5678),
frame_type: 0,
reason_phrase: vec![0x01, 0x02, 0x03],
reason_phrase: String::from("\x01\x02\x03"),
};

just_dec(&f, "1d8000567803010203");
Expand Down
48 changes: 24 additions & 24 deletions neqo-transport/src/qlog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ pub fn packet_sent(
let mut frames = SmallVec::new();
while d.remaining() > 0 {
if let Ok(f) = Frame::decode(&mut d) {
frames.push(QuicFrame::from(&f));
frames.push(QuicFrame::from(f));
} else {
qinfo!("qlog: invalid frame");
break;
Expand Down Expand Up @@ -293,7 +293,7 @@ pub fn packet_received(

while d.remaining() > 0 {
if let Ok(f) = Frame::decode(&mut d) {
frames.push(QuicFrame::from(&f));
frames.push(QuicFrame::from(f));
} else {
qinfo!("qlog: invalid frame");
break;
Expand Down Expand Up @@ -387,12 +387,12 @@ pub fn metrics_updated(qlog: &mut NeqoQlog, updated_metrics: &[QlogMetric]) {

#[allow(clippy::too_many_lines)] // Yeah, but it's a nice match.
#[allow(clippy::cast_possible_truncation, clippy::cast_precision_loss)] // No choice here.
impl From<&Frame<'_>> for QuicFrame {
fn from(frame: &Frame) -> Self {
impl From<Frame<'_>> for QuicFrame {
fn from(frame: Frame) -> Self {
match frame {
Frame::Padding(len) => QuicFrame::Padding {
length: None,
payload_length: u32::from(*len),
payload_length: u32::from(len),
},
Frame::Ping => QuicFrame::Ping {
length: None,
Expand All @@ -406,7 +406,7 @@ impl From<&Frame<'_>> for QuicFrame {
ecn_count,
} => {
let ranges =
Frame::decode_ack_frame(*largest_acknowledged, *first_ack_range, ack_ranges)
Frame::decode_ack_frame(largest_acknowledged, first_ack_range, &ack_ranges)
.ok();

let acked_ranges = ranges.map(|all| {
Expand All @@ -418,7 +418,7 @@ impl From<&Frame<'_>> for QuicFrame {
});

QuicFrame::Ack {
ack_delay: Some(*ack_delay as f32 / 1000.0),
ack_delay: Some(ack_delay as f32 / 1000.0),
acked_ranges,
ect1: ecn_count.map(|c| c[IpTosEcn::Ect1]),
ect0: ecn_count.map(|c| c[IpTosEcn::Ect0]),
Expand All @@ -433,8 +433,8 @@ impl From<&Frame<'_>> for QuicFrame {
final_size,
} => QuicFrame::ResetStream {
stream_id: stream_id.as_u64(),
error_code: *application_error_code,
final_size: *final_size,
error_code: application_error_code,
final_size,
length: None,
payload_length: None,
},
Expand All @@ -443,12 +443,12 @@ impl From<&Frame<'_>> for QuicFrame {
application_error_code,
} => QuicFrame::StopSending {
stream_id: stream_id.as_u64(),
error_code: *application_error_code,
error_code: application_error_code,
length: None,
payload_length: None,
},
Frame::Crypto { offset, data } => QuicFrame::Crypto {
offset: *offset,
offset,
length: data.len() as u64,
},
Frame::NewToken { token } => QuicFrame::NewToken {
Expand All @@ -470,20 +470,20 @@ impl From<&Frame<'_>> for QuicFrame {
..
} => QuicFrame::Stream {
stream_id: stream_id.as_u64(),
offset: *offset,
offset,
length: data.len() as u64,
fin: Some(*fin),
fin: Some(fin),
raw: None,
},
Frame::MaxData { maximum_data } => QuicFrame::MaxData {
maximum: *maximum_data,
maximum: maximum_data,
},
Frame::MaxStreamData {
stream_id,
maximum_stream_data,
} => QuicFrame::MaxStreamData {
stream_id: stream_id.as_u64(),
maximum: *maximum_stream_data,
maximum: maximum_stream_data,
},
Frame::MaxStreams {
stream_type,
Expand All @@ -493,15 +493,15 @@ impl From<&Frame<'_>> for QuicFrame {
NeqoStreamType::BiDi => StreamType::Bidirectional,
NeqoStreamType::UniDi => StreamType::Unidirectional,
},
maximum: *maximum_streams,
maximum: maximum_streams,
},
Frame::DataBlocked { data_limit } => QuicFrame::DataBlocked { limit: *data_limit },
Frame::DataBlocked { data_limit } => QuicFrame::DataBlocked { limit: data_limit },
Frame::StreamDataBlocked {
stream_id,
stream_data_limit,
} => QuicFrame::StreamDataBlocked {
stream_id: stream_id.as_u64(),
limit: *stream_data_limit,
limit: stream_data_limit,
},
Frame::StreamsBlocked {
stream_type,
Expand All @@ -511,22 +511,22 @@ impl From<&Frame<'_>> for QuicFrame {
NeqoStreamType::BiDi => StreamType::Bidirectional,
NeqoStreamType::UniDi => StreamType::Unidirectional,
},
limit: *stream_limit,
limit: stream_limit,
},
Frame::NewConnectionId {
sequence_number,
retire_prior,
connection_id,
stateless_reset_token,
} => QuicFrame::NewConnectionId {
sequence_number: *sequence_number as u32,
retire_prior_to: *retire_prior as u32,
sequence_number: sequence_number as u32,
retire_prior_to: retire_prior as u32,
connection_id_length: Some(connection_id.len() as u8),
connection_id: hex(connection_id),
stateless_reset_token: Some(hex(stateless_reset_token)),
},
Frame::RetireConnectionId { sequence_number } => QuicFrame::RetireConnectionId {
sequence_number: *sequence_number as u32,
sequence_number: sequence_number as u32,
},
Frame::PathChallenge { data } => QuicFrame::PathChallenge {
data: Some(hex(data)),
Expand All @@ -545,8 +545,8 @@ impl From<&Frame<'_>> for QuicFrame {
},
error_code: Some(error_code.code()),
error_code_value: Some(0),
reason: Some(String::from_utf8_lossy(reason_phrase).to_string()),
trigger_frame_type: Some(*frame_type),
reason: Some(reason_phrase),
trigger_frame_type: Some(frame_type),
},
Frame::HandshakeDone => QuicFrame::HandshakeDone,
Frame::AckFrequency { .. } => QuicFrame::Unknown {
Expand Down
Loading