From: Hugo Landau <hlandau@openssl.org>
Date: Fri, 8 Sep 2023 12:56:32 +0000 (+0100)
Subject: QLOG: Wiring: QUIC QTX
X-Git-Tag: openssl-3.3.0-alpha1~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=434d52a4b693c1f9fc008826ba2c7cceedb74964;p=thirdparty%2Fopenssl.git

QLOG: Wiring: QUIC QTX

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
---

diff --git a/include/internal/quic_record_tx.h b/include/internal/quic_record_tx.h
index 06889983261..68b43f58e9b 100644
--- a/include/internal/quic_record_tx.h
+++ b/include/internal/quic_record_tx.h
@@ -15,6 +15,7 @@
 # include "internal/quic_types.h"
 # include "internal/quic_predef.h"
 # include "internal/quic_record_util.h"
+# include "internal/qlog.h"
 
 # ifndef OPENSSL_NO_QUIC
 
@@ -47,6 +48,9 @@ typedef struct ossl_qtx_args_st {
 
     /* Maximum datagram payload length (MDPL) for TX purposes. */
     size_t          mdpl;
+
+    /* QLOG instance to use, or NULL. */
+    QLOG           *qlog;
 } OSSL_QTX_ARGS;
 
 /* Instantiates a new QTX. */
diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c
index c01abed0d66..bc37f8d9eec 100644
--- a/ssl/quic/quic_record_tx.c
+++ b/ssl/quic/quic_record_tx.c
@@ -8,6 +8,7 @@
  */
 
 #include "internal/quic_record_tx.h"
+#include "internal/qlog_event_helpers.h"
 #include "internal/bio_addr.h"
 #include "internal/common.h"
 #include "quic_record_shared.h"
@@ -60,6 +61,9 @@ struct ossl_qtx_st {
     /* TX BIO. */
     BIO                        *bio;
 
+    /* QLOG instance if in use, or NULL. */
+    QLOG                       *qlog;
+
     /* TX maximum datagram payload length. */
     size_t                      mdpl;
 
@@ -117,6 +121,7 @@ OSSL_QTX *ossl_qtx_new(const OSSL_QTX_ARGS *args)
     qtx->propq              = args->propq;
     qtx->bio                = args->bio;
     qtx->mdpl               = args->mdpl;
+    qtx->qlog               = args->qlog;
     return qtx;
 }