mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC TXP: Allow QLOG instance retrieval via callback

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23535)
This commit is contained in:
Hugo Landau 2024-02-12 09:50:42 +00:00 committed by Tomas Mraz
parent 9f2349aebe
commit 6f09c8071a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/quic_txp.h
View File

@ -50,7 +50,8 @@ typedef struct ossl_quic_tx_packetiser_args_st {
OSSL_CC_DATA *cc_data; /* QUIC Congestion Controller Instance */
OSSL_TIME (*now)(void *arg); /* Callback to get current time. */
void *now_arg;
QLOG *qlog; /* Optional QLOG instance */
QLOG *(*get_qlog_cb)(void *arg); /* Optional QLOG retrieval func */
void *get_qlog_cb_arg;
/*
* Injected dependencies - crypto streams.
@ -139,10 +140,11 @@ int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
const BIO_ADDR *peer);
/*
* Change the QLOG instance in use after instantiation.
* Change the QLOG instance retrieval function in use after instantiation.
*/
void ossl_quic_tx_packetiser_set0_qlog(OSSL_QUIC_TX_PACKETISER *txp,
QLOG *qlog);
void ossl_quic_tx_packetiser_set_qlog_cb(OSSL_QUIC_TX_PACKETISER *txp,
QLOG *(*get_qlog_cb)(void *arg),
void *get_qlog_cb_arg);
/*
* Inform the TX packetiser that an EL has been discarded. Idempotent.

11
ssl/quic/quic_txp.c
View File

@ -482,7 +482,8 @@ OSSL_QUIC_TX_PACKETISER *ossl_quic_tx_packetiser_new(const OSSL_QUIC_TX_PACKETIS
on_regen_notify, txp,
on_confirm_notify, txp,
on_sstream_updated, txp,
args->qlog)) {
args->get_qlog_cb,
args->get_qlog_cb_arg)) {
OPENSSL_free(txp);
return NULL;
}
@ -626,10 +627,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_set0_qlog(OSSL_QUIC_TX_PACKETISER *txp,
QLOG *qlog)
void ossl_quic_tx_packetiser_set_qlog_cb(OSSL_QUIC_TX_PACKETISER *txp,
QLOG *(*get_qlog_cb)(void *arg),
void *get_qlog_cb_arg)
{
ossl_quic_fifd_set0_qlog(&txp->fifd, qlog);
ossl_quic_fifd_set_qlog_cb(&txp->fifd, get_qlog_cb, get_qlog_cb_arg);
}
int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp,