diff options
Diffstat (limited to '')
| -rw-r--r-- | third_party/rust/qlog/.cargo-checksum.json | 2 | ||||
| -rw-r--r-- | third_party/rust/qlog/Cargo.toml | 2 | ||||
| -rw-r--r-- | third_party/rust/qlog/src/events/mod.rs | 3 | ||||
| -rw-r--r-- | third_party/rust/qlog/src/events/quic.rs | 21 | ||||
| -rw-r--r-- | third_party/rust/qlog/src/lib.rs | 28 |
5 files changed, 44 insertions, 12 deletions
diff --git a/third_party/rust/qlog/.cargo-checksum.json b/third_party/rust/qlog/.cargo-checksum.json index 4aae6bf3b8..e0db62dc79 100644 --- a/third_party/rust/qlog/.cargo-checksum.json +++ b/third_party/rust/qlog/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"66c6d85a84c84711f3abddaafb163bc6025a8505701fea8b61bfa961851be757","README.md":"597691eb766c2cbd7a6591bda56d3e70e6836b62b6327fb73497523eabd5b53d","src/events/connectivity.rs":"116993412e200e375c97762980ffb638d2244197fd752b9569b5b20baf574308","src/events/h3.rs":"4799179c4d18403a3936a327c483d110bd058d42061f9cdd39601b3e91500c1b","src/events/mod.rs":"75f57b4717fa9777e19d61b99b6a79164f0e8bca9b4681c3ab11b204320c8c55","src/events/qpack.rs":"5c7267c45e3fb947cdfa946f9f9692d3e3e36a166f70124ba293dc27534267d0","src/events/quic.rs":"88b884f5788c671ffee79a3448f367c18f95ee30531262fcc14310d80e662f4a","src/events/security.rs":"e9852d7de16851b62c3e0a886a2c1a31d237e62574ef88428ef62dd179b0b008","src/lib.rs":"bbc190a6d0f484fd723f9df6c1b2a4596f826e0282ad40ee17a0822ea28a5626","src/reader.rs":"4e0069c24aca9cb99d75075c9b784fa02855ea449d2f1528bea944a4e02a9af5","src/streamer.rs":"4774c2abde1a5b0f4448aac06c62c7927208c12f338c46981f80c98703b54074"},"package":"9c0407438c69b3d99714a796a135cbfb2d60744e4747fb2b46a87acd1c1fcd0e"}
\ No newline at end of file +{"files":{"Cargo.toml":"f660fd1858ac7bc0cc6a0db2058a311328678b5d19e5f7a2eb1cdebe74155752","README.md":"597691eb766c2cbd7a6591bda56d3e70e6836b62b6327fb73497523eabd5b53d","src/events/connectivity.rs":"116993412e200e375c97762980ffb638d2244197fd752b9569b5b20baf574308","src/events/h3.rs":"4799179c4d18403a3936a327c483d110bd058d42061f9cdd39601b3e91500c1b","src/events/mod.rs":"2e9f00885face20abeb183c7421b11d402c13d841921ce9a8b0061b141e97353","src/events/qpack.rs":"5c7267c45e3fb947cdfa946f9f9692d3e3e36a166f70124ba293dc27534267d0","src/events/quic.rs":"aae0ff30e8cd27219dbb5bcb34d78d11c3f81bbdc099aabdd37b8f7206e3fb9c","src/events/security.rs":"e9852d7de16851b62c3e0a886a2c1a31d237e62574ef88428ef62dd179b0b008","src/lib.rs":"ef7121a53369c995e333a84c6ed0c14c91ca5825588a27a47ae5d92a44cb0b07","src/reader.rs":"4e0069c24aca9cb99d75075c9b784fa02855ea449d2f1528bea944a4e02a9af5","src/streamer.rs":"4774c2abde1a5b0f4448aac06c62c7927208c12f338c46981f80c98703b54074"},"package":"9b5f65b920fa913ce92267bb3c4ed3b9c2f81d05f8e1376c3bbc95455eedb7df"}
\ No newline at end of file diff --git a/third_party/rust/qlog/Cargo.toml b/third_party/rust/qlog/Cargo.toml index 4a5eb1ff96..928951a973 100644 --- a/third_party/rust/qlog/Cargo.toml +++ b/third_party/rust/qlog/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2018" name = "qlog" -version = "0.12.0" +version = "0.13.0" authors = ["Lucas Pardue <lucaspardue.24.7@gmail.com>"] description = "qlog data model for QUIC and HTTP/3" readme = "README.md" diff --git a/third_party/rust/qlog/src/events/mod.rs b/third_party/rust/qlog/src/events/mod.rs index ac18276fd0..dbd35183ef 100644 --- a/third_party/rust/qlog/src/events/mod.rs +++ b/third_party/rust/qlog/src/events/mod.rs @@ -203,6 +203,9 @@ impl From<EventType> for EventImportance { ConnectivityEventType::ConnectionStarted, ) => EventImportance::Base, EventType::ConnectivityEventType( + ConnectivityEventType::ConnectionClosed, + ) => EventImportance::Base, + EventType::ConnectivityEventType( ConnectivityEventType::ConnectionIdUpdated, ) => EventImportance::Base, EventType::ConnectivityEventType( diff --git a/third_party/rust/qlog/src/events/quic.rs b/third_party/rust/qlog/src/events/quic.rs index a7c1fa3225..e504125a1a 100644 --- a/third_party/rust/qlog/src/events/quic.rs +++ b/third_party/rust/qlog/src/events/quic.rs @@ -384,30 +384,43 @@ pub enum QuicFrameTypeName { // ensure it goes out on the wire. This means that deserialization of frames // also works automatically. pub enum QuicFrame { - Padding, + Padding { + length: Option<u32>, + payload_length: u32, + }, - Ping, + Ping { + length: Option<u32>, + payload_length: Option<u32>, + }, Ack { ack_delay: Option<f32>, acked_ranges: Option<AckedRanges>, ect1: Option<u64>, - ect0: Option<u64>, - ce: Option<u64>, + + length: Option<u32>, + payload_length: Option<u32>, }, ResetStream { stream_id: u64, error_code: u64, final_size: u64, + + length: Option<u32>, + payload_length: Option<u32>, }, StopSending { stream_id: u64, error_code: u64, + + length: Option<u32>, + payload_length: Option<u32>, }, Crypto { diff --git a/third_party/rust/qlog/src/lib.rs b/third_party/rust/qlog/src/lib.rs index 68ff278fcd..ed26570fe0 100644 --- a/third_party/rust/qlog/src/lib.rs +++ b/third_party/rust/qlog/src/lib.rs @@ -332,8 +332,14 @@ //! Some(&dcid), //! ); //! -//! let ping = qlog::events::quic::QuicFrame::Ping; -//! let padding = qlog::events::quic::QuicFrame::Padding; +//! let ping = qlog::events::quic::QuicFrame::Ping { +//! length: None, +//! payload_length: None, +//! }; +//! let padding = qlog::events::quic::QuicFrame::Padding { +//! length: None, +//! payload_length: 1234, +//! }; //! //! let event_data = //! qlog::events::EventData::PacketSent(qlog::events::quic::PacketSent { @@ -790,7 +796,8 @@ mod tests { }, "frames": [ { - "frame_type": "padding" + "frame_type": "padding", + "payload_length": 1234 }, { "frame_type": "ping" @@ -808,14 +815,23 @@ mod tests { let pkt_hdr = make_pkt_hdr(PacketType::Initial); - let frames = - vec![QuicFrame::Padding, QuicFrame::Ping, QuicFrame::Stream { + let frames = vec![ + QuicFrame::Padding { + payload_length: 1234, + length: None, + }, + QuicFrame::Ping { + payload_length: None, + length: None, + }, + QuicFrame::Stream { stream_id: 0, offset: 0, length: 100, fin: Some(true), raw: None, - }]; + }, + ]; let ev_data = EventData::PacketSent(PacketSent { header: pkt_hdr, |