summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2024-01-29 13:36:11 +0100
committerHugo Landau <hlandau@openssl.org>2024-02-02 12:50:29 +0100
commit572c449a10697d8424a6117df807700a688d753d (patch)
treed7b963e358338f0caf41c0b0968199281ae82536
parentQUIC QTX: Allow QLOG instance to be changed after instantiation (diff)
downloadopenssl-572c449a10697d8424a6117df807700a688d753d.tar.xz
openssl-572c449a10697d8424a6117df807700a688d753d.zip
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)
-rw-r--r--include/internal/quic_txp.h6
-rw-r--r--ssl/quic/quic_txp.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h
index 6f1debb1d9..b1769b15e4 100644
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -139,6 +139,12 @@ 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.
*
* This does not inform the QTX as well; the caller must also inform the QTX.
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index c23ec34668..9ed1858e0f 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)
{