From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 29 Jan 2024 12:36:11 +0000 (+0000)
Subject: QUIC TXP: Allow QLOG instance to be changed after instantiation
X-Git-Tag: openssl-3.3.0-alpha1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572c449a10697d8424a6117df807700a688d753d;p=thirdparty%2Fopenssl.git

QUIC TXP: Allow QLOG instance to be changed after instantiation

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_txp.h b/include/internal/quic_txp.h
index 6f1debb1d99..b1769b15e48 100644
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -138,6 +138,12 @@ int ossl_quic_tx_packetiser_set_cur_scid(OSSL_QUIC_TX_PACKETISER *txp,
 int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
                                      const BIO_ADDR *peer);
 
+/*
+ * Change the QLOG instance in use after instantiation.
+ */
+void ossl_quic_tx_packetiser_set_qlog(OSSL_QUIC_TX_PACKETISER *txp,
+                                      QLOG *qlog);
+
 /*
  * Inform the TX packetiser that an EL has been discarded. Idempotent.
  *
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index c23ec346681..9ed1858e0fb 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -626,6 +626,12 @@ void ossl_quic_tx_packetiser_set_ack_tx_cb(OSSL_QUIC_TX_PACKETISER *txp,
     txp->ack_tx_cb_arg  = cb_arg;
 }
 
+void ossl_quic_tx_packetiser_set_qlog(OSSL_QUIC_TX_PACKETISER *txp,
+                                      QLOG *qlog)
+{
+    ossl_quic_fifd_set_qlog(&txp->fifd, qlog);
+}
+
 int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp,
                                               uint32_t enc_level)
 {