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

qlog: align with spec removal of categories #1864

Draft
wants to merge 1 commit into
base: qlog-09-update
Choose a base branch
from
Draft

qlog: align with spec removal of categories #1864

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
8 changes: 4 additions & 4 deletions h3i/src/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ pub mod connection_summary;
pub mod sync_client;

use connection_summary::*;
use qlog::events::http::h3::FrameParsed;
use qlog::events::http::h3::HttpHeader;
use qlog::events::http3::FrameParsed;
use qlog::events::http3::HttpHeader;
use quiche::ConnectionError;

use std::collections::HashMap;
Expand All @@ -51,7 +51,7 @@ use crate::frame_parser::FrameParser;
use crate::frame_parser::InterruptCause;
use crate::recordreplay::qlog::QlogEvent;
use crate::recordreplay::qlog::*;
use qlog::events::http::h3::Http3Frame;
use qlog::events::http3::Http3Frame;
use qlog::events::EventData;
use qlog::streamer::QlogStreamer;

Expand Down Expand Up @@ -471,7 +471,7 @@ fn handle_response_frame(
let qlog_headers: Vec<HttpHeader> = enriched_headers
.headers()
.iter()
.map(|h| qlog::events::http::h3::HttpHeader {
.map(|h| qlog::events::http3::HttpHeader {
name: String::from_utf8_lossy(h.name()).into_owned(),
value: String::from_utf8_lossy(h.value()).into_owned(),
})
Expand Down
4 changes: 2 additions & 2 deletions h3i/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
//! [RFC 9204]: https://www.rfc-editor.org/rfc/rfc9204.html

use qlog::events::quic::PacketHeader;
use qlog::events::quic::quic::PacketSent;
use qlog::events::quic::PacketSent;
use qlog::events::quic::PacketType;
use qlog::events::quic::quic::QuicFrame;
use qlog::events::quic::QuicFrame;
use qlog::events::EventData;
pub use quiche;
use quiche::h3::NameValue;
Expand Down
2 changes: 1 addition & 1 deletion h3i/src/prompts/h3/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use inquire::validator::Validation;
use inquire::CustomUserError;
use inquire::Select;
use inquire::Text;
use qlog::events::quic::quic::ErrorSpace;
use qlog::events::quic::ErrorSpace;

use crate::prompts::h3;

Expand Down
2 changes: 1 addition & 1 deletion h3i/src/prompts/h3/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use inquire::validator::Validation;
use inquire::InquireError;
use inquire::Select;
use inquire::Text;
use qlog::events::quic::quic::ErrorSpace;
use qlog::events::quic::ErrorSpace;
use quiche::ConnectionError;

use crate::actions::h3::Action;
Expand Down
40 changes: 20 additions & 20 deletions h3i/src/recordreplay/qlog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

use std::collections::BTreeMap;

use qlog::events::http::h3::FrameCreated;
use qlog::events::http::h3::Owner;
use qlog::events::http::h3::StreamTypeSet;
use qlog::events::http::h3::Http3Frame;
use qlog::events::quic::quic::ErrorSpace;
use qlog::events::quic::quic::PacketSent;
use qlog::events::quic::quic::QuicFrame;
use qlog::events::http3::FrameCreated;
use qlog::events::http3::Http3Frame;
use qlog::events::http3::Owner;
use qlog::events::http3::StreamTypeSet;
use qlog::events::quic::ErrorSpace;
use qlog::events::quic::PacketSent;
use qlog::events::quic::QuicFrame;
use qlog::events::Event;
use qlog::events::EventData;
use qlog::events::ExData;
Expand Down Expand Up @@ -112,7 +112,7 @@ impl From<&Action> for QlogEvents {
} => {
let qlog_headers = headers
.iter()
.map(|h| qlog::events::http::h3::HttpHeader {
.map(|h| qlog::events::http3::HttpHeader {
name: String::from_utf8_lossy(h.name()).into_owned(),
value: String::from_utf8_lossy(h.value()).into_owned(),
})
Expand Down Expand Up @@ -148,18 +148,18 @@ impl From<&Action> for QlogEvents {
} => {
let ty = match *stream_type {
HTTP3_CONTROL_STREAM_TYPE_ID =>
qlog::events::http::h3::StreamType::Control,
qlog::events::http3::StreamType::Control,
HTTP3_PUSH_STREAM_TYPE_ID =>
qlog::events::http::h3::StreamType::Push,
qlog::events::http3::StreamType::Push,
QPACK_ENCODER_STREAM_TYPE_ID =>
qlog::events::http::h3::StreamType::QpackEncode,
qlog::events::http3::StreamType::QpackEncode,
QPACK_DECODER_STREAM_TYPE_ID =>
qlog::events::http::h3::StreamType::QpackDecode,
qlog::events::http3::StreamType::QpackDecode,

_ => qlog::events::http::h3::StreamType::Unknown,
_ => qlog::events::http3::StreamType::Unknown,
};
let ty_val =
if matches!(ty, qlog::events::http::h3::StreamType::Unknown) {
if matches!(ty, qlog::events::http3::StreamType::Unknown) {
Some(*stream_type)
} else {
None
Expand Down Expand Up @@ -534,12 +534,12 @@ fn from_qlog_stream_type_set(
let mut actions = vec![];
let fin_stream = parse_ex_data(ex_data);
let stream_type = match st.stream_type {
qlog::events::http::h3::StreamType::Control => Some(0x0),
qlog::events::http::h3::StreamType::Push => Some(0x1),
qlog::events::http::h3::StreamType::QpackEncode => Some(0x2),
qlog::events::http::h3::StreamType::QpackDecode => Some(0x3),
qlog::events::http::h3::StreamType::Reserved |
qlog::events::http::h3::StreamType::Unknown => st.stream_type_value,
qlog::events::http3::StreamType::Control => Some(0x0),
qlog::events::http3::StreamType::Push => Some(0x1),
qlog::events::http3::StreamType::QpackEncode => Some(0x2),
qlog::events::http3::StreamType::QpackDecode => Some(0x3),
qlog::events::http3::StreamType::Reserved |
qlog::events::http3::StreamType::Unknown => st.stream_type_value,
_ => None,
};

Expand Down
1 change: 0 additions & 1 deletion qlog/src/events/http/mod.rs
View file
Open in desktop

This file was deleted.

0 qlog/src/events/http/h3.rs → qlog/src/events/http3.rs
View file
Open in desktop
File renamed without changes.
Loading
Loading