From 02c69cfc30aed8cb78ea9c7f276886353f813c70 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 15 Apr 2024 19:11:35 +0300
Subject: [PATCH] chore: Bump qlog to 0.13 and deal with the fallout

Fixes #1826
---
 neqo-bin/Cargo.toml        |  2 +-
 neqo-common/Cargo.toml     |  2 +-
 neqo-http3/Cargo.toml      |  2 +-
 neqo-qpack/Cargo.toml      |  2 +-
 neqo-transport/Cargo.toml  |  2 +-
 neqo-transport/src/qlog.rs | 16 ++++++++++++++--
 test-fixture/Cargo.toml    |  2 +-
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/neqo-bin/Cargo.toml b/neqo-bin/Cargo.toml
index a165a4ac32..719e621c84 100644
--- a/neqo-bin/Cargo.toml
+++ b/neqo-bin/Cargo.toml
@@ -34,7 +34,7 @@ neqo-crypto = { path = "./../neqo-crypto" }
 neqo-http3 = { path = "./../neqo-http3" }
 neqo-qpack = { path = "./../neqo-qpack" }
 neqo-transport = { path = "./../neqo-transport" }
-qlog = { version = "0.12", default-features = false }
+qlog = { version = "0.13", default-features = false }
 quinn-udp = { git = "https://github.com/quinn-rs/quinn/", rev = "a947962131aba8a6521253d03cc948b20098a2d6" }
 regex = { version = "1.9", default-features = false, features = ["unicode-perl"] }
 tokio = { version = "1", default-features = false, features = ["net", "time", "macros", "rt", "rt-multi-thread"] }
diff --git a/neqo-common/Cargo.toml b/neqo-common/Cargo.toml
index 069d67b834..cc8c4efe7b 100644
--- a/neqo-common/Cargo.toml
+++ b/neqo-common/Cargo.toml
@@ -17,7 +17,7 @@ workspace = true
 enum-map = { version = "2.7", default-features = false }
 env_logger = { version = "0.10", default-features = false }
 log = { version = "0.4", default-features = false }
-qlog = { version = "0.12", default-features = false }
+qlog = { version = "0.13", default-features = false }
 time = { version = "0.3", default-features = false, features = ["formatting"] }
 
 [dev-dependencies]
diff --git a/neqo-http3/Cargo.toml b/neqo-http3/Cargo.toml
index 27f43fd93f..881cb42fac 100644
--- a/neqo-http3/Cargo.toml
+++ b/neqo-http3/Cargo.toml
@@ -19,7 +19,7 @@ neqo-common = { path = "./../neqo-common" }
 neqo-crypto = { path = "./../neqo-crypto" }
 neqo-qpack = { path = "./../neqo-qpack" }
 neqo-transport = { path = "./../neqo-transport" }
-qlog = { version = "0.12", default-features = false }
+qlog = { version = "0.13", default-features = false }
 sfv = { version = "0.9", default-features = false }
 smallvec = { version = "1.11", default-features = false }
 url = { version = "2.5", default-features = false }
diff --git a/neqo-qpack/Cargo.toml b/neqo-qpack/Cargo.toml
index c3e2ab8a66..822c326fbb 100644
--- a/neqo-qpack/Cargo.toml
+++ b/neqo-qpack/Cargo.toml
@@ -17,7 +17,7 @@ log = { version = "0.4", default-features = false }
 neqo-common = { path = "./../neqo-common" }
 neqo-crypto = { path = "./../neqo-crypto" }
 neqo-transport = { path = "./../neqo-transport" }
-qlog = { version = "0.12", default-features = false }
+qlog = { version = "0.13", default-features = false }
 static_assertions = { version = "1.1", default-features = false }
 
 [dev-dependencies]
diff --git a/neqo-transport/Cargo.toml b/neqo-transport/Cargo.toml
index 125da11508..34653313d7 100644
--- a/neqo-transport/Cargo.toml
+++ b/neqo-transport/Cargo.toml
@@ -17,7 +17,7 @@ indexmap = { version = "1.9", default-features = false }
 log = { version = "0.4", default-features = false }
 neqo-common = { path = "../neqo-common" }
 neqo-crypto = { path = "../neqo-crypto" }
-qlog = { version = "0.12", default-features = false }
+qlog = { version = "0.13", default-features = false }
 smallvec = { version = "1.11", default-features = false }
 
 [dev-dependencies]
diff --git a/neqo-transport/src/qlog.rs b/neqo-transport/src/qlog.rs
index a8ad986d2a..c7ace057ff 100644
--- a/neqo-transport/src/qlog.rs
+++ b/neqo-transport/src/qlog.rs
@@ -392,8 +392,14 @@ impl From<&Frame<'_>> for QuicFrame {
         match frame {
             // TODO: Add payload length to `QuicFrame::Padding` once
             // https://github.com/cloudflare/quiche/pull/1745 is available via the qlog crate.
-            Frame::Padding { .. } => QuicFrame::Padding,
-            Frame::Ping => QuicFrame::Ping,
+            Frame::Padding(len) => QuicFrame::Padding {
+                length: None,
+                payload_length: u32::from(*len),
+            },
+            Frame::Ping => QuicFrame::Ping {
+                length: None,
+                payload_length: None,
+            },
             Frame::Ack {
                 largest_acknowledged,
                 ack_delay,
@@ -418,6 +424,8 @@ impl From<&Frame<'_>> for QuicFrame {
                     ect1: None,
                     ect0: None,
                     ce: None,
+                    length: None,
+                    payload_length: None,
                 }
             }
             Frame::ResetStream {
@@ -428,6 +436,8 @@ impl From<&Frame<'_>> for QuicFrame {
                 stream_id: stream_id.as_u64(),
                 error_code: *application_error_code,
                 final_size: *final_size,
+                length: None,
+                payload_length: None,
             },
             Frame::StopSending {
                 stream_id,
@@ -435,6 +445,8 @@ impl From<&Frame<'_>> for QuicFrame {
             } => QuicFrame::StopSending {
                 stream_id: stream_id.as_u64(),
                 error_code: *application_error_code,
+                length: None,
+                payload_length: None,
             },
             Frame::Crypto { offset, data } => QuicFrame::Crypto {
                 offset: *offset,
diff --git a/test-fixture/Cargo.toml b/test-fixture/Cargo.toml
index 9de2a24cce..b82f42c222 100644
--- a/test-fixture/Cargo.toml
+++ b/test-fixture/Cargo.toml
@@ -19,7 +19,7 @@ neqo-crypto = { path = "../neqo-crypto" }
 neqo-http3 = { path = "../neqo-http3" }
 neqo-qpack = { path = "../neqo-qpack" }
 neqo-transport = { path = "../neqo-transport" }
-qlog = { version = "0.12", default-features = false }
+qlog = { version = "0.13", default-features = false }
 
 [features]
 bench = []