diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-09-08 13:30:56 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2024-02-02 11:49:34 +0000 |
| commit | 3e5287803972de26d0ccbb912bf26e4fd42e39e1 (patch) | |
| tree | d3b81a8a3c05edf45fef4e16fee3cdfec44ea3dc /ssl | |
| parent | 285a76bda02192818cedc2a7db8ff54bbd6a3586 (diff) | |
QLOG: Wiring: QUIC FIFD
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/quic/quic_channel.c | 1 | ||||
| -rw-r--r-- | ssl/quic/quic_fifd.c | 4 | ||||
| -rw-r--r-- | ssl/quic/quic_txp.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index 9e8f30bf1e..2b1838bb91 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -262,6 +262,7 @@ static int ch_init(QUIC_CHANNEL *ch) txp_args.cc_data = ch->cc_data; txp_args.now = get_time; txp_args.now_arg = ch; + txp_args.qlog = ch_get_qlog(ch); for (pn_space = QUIC_PN_SPACE_INITIAL; pn_space < QUIC_PN_SPACE_NUM; ++pn_space) { ch->crypto_send[pn_space] = ossl_quic_sstream_new(INIT_CRYPTO_SEND_BUF_LEN); diff --git a/ssl/quic/quic_fifd.c b/ssl/quic/quic_fifd.c index a3dd1db978..14ae8f07ba 100644 --- a/ssl/quic/quic_fifd.c +++ b/ssl/quic/quic_fifd.c @@ -34,7 +34,8 @@ int ossl_quic_fifd_init(QUIC_FIFD *fifd, void *confirm_frame_arg, void (*sstream_updated)(uint64_t stream_id, void *arg), - void *sstream_updated_arg) + void *sstream_updated_arg, + QLOG *qlog) { if (cfq == NULL || ackm == NULL || txpim == NULL || get_sstream_by_id == NULL || regen_frame == NULL) @@ -51,6 +52,7 @@ int ossl_quic_fifd_init(QUIC_FIFD *fifd, fifd->confirm_frame_arg = confirm_frame_arg; fifd->sstream_updated = sstream_updated; fifd->sstream_updated_arg = sstream_updated_arg; + fifd->qlog = qlog; return 1; } diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c index f26f1e81a1..b18f8c0e38 100644 --- a/ssl/quic/quic_txp.c +++ b/ssl/quic/quic_txp.c @@ -481,7 +481,8 @@ OSSL_QUIC_TX_PACKETISER *ossl_quic_tx_packetiser_new(const OSSL_QUIC_TX_PACKETIS get_sstream_by_id, txp, on_regen_notify, txp, on_confirm_notify, txp, - on_sstream_updated, txp)) { + on_sstream_updated, txp, + args->qlog)) { OPENSSL_free(txp); return NULL; } |