diff options
| author | Hugo Landau <hlandau@openssl.org> | 2024-02-01 11:00:55 +0000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2024-02-02 11:50:30 +0000 |
| commit | b58abf982218c704801d8a7b0f5725b730c94671 (patch) | |
| tree | 73540a58ef9aa1da188709fe6283516038497a64 /ssl | |
| parent | 5f603a12cd3bc0b7ea43889fabac2f728590497e (diff) | |
QUIC QLOG: Use set0
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 | 4 | ||||
| -rw-r--r-- | ssl/quic/quic_fifd.c | 2 | ||||
| -rw-r--r-- | ssl/quic/quic_record_tx.c | 2 | ||||
| -rw-r--r-- | ssl/quic/quic_txp.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index 49d1121392..c77bcf4a91 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -3331,8 +3331,8 @@ int ossl_quic_channel_on_new_conn(QUIC_CHANNEL *ch, const BIO_ADDR *peer, return 0; /* Setup QLOG, which did not happen earlier due to lacking an Initial ODCID. */ - ossl_qtx_set_qlog(ch->qtx, ch_get_qlog(ch)); - ossl_quic_tx_packetiser_set_qlog(ch->txp, ch_get_qlog(ch)); + ossl_qtx_set0_qlog(ch->qtx, ch_get_qlog(ch)); + ossl_quic_tx_packetiser_set0_qlog(ch->txp, ch_get_qlog(ch)); /* Plug in secrets for the Initial EL. */ if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx, diff --git a/ssl/quic/quic_fifd.c b/ssl/quic/quic_fifd.c index fc268c5420..0abc8cb628 100644 --- a/ssl/quic/quic_fifd.c +++ b/ssl/quic/quic_fifd.c @@ -294,7 +294,7 @@ int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt) return ossl_ackm_on_tx_packet(fifd->ackm, &pkt->ackm_pkt); } -void ossl_quic_fifd_set_qlog(QUIC_FIFD *fifd, QLOG *qlog) +void ossl_quic_fifd_set0_qlog(QUIC_FIFD *fifd, QLOG *qlog) { fifd->qlog = qlog; } diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c index 663b163727..5d6b84d98f 100644 --- a/ssl/quic/quic_record_tx.c +++ b/ssl/quic/quic_record_tx.c @@ -167,7 +167,7 @@ void ossl_qtx_set_mutator(OSSL_QTX *qtx, ossl_mutate_packet_cb mutatecb, qtx->mutatearg = mutatearg; } -void ossl_qtx_set_qlog(OSSL_QTX *qtx, QLOG *qlog) +void ossl_qtx_set0_qlog(OSSL_QTX *qtx, QLOG *qlog) { qtx->qlog = qlog; } diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c index 9ed1858e0f..1327ba83bb 100644 --- a/ssl/quic/quic_txp.c +++ b/ssl/quic/quic_txp.c @@ -626,10 +626,10 @@ 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) +void ossl_quic_tx_packetiser_set0_qlog(OSSL_QUIC_TX_PACKETISER *txp, + QLOG *qlog) { - ossl_quic_fifd_set_qlog(&txp->fifd, qlog); + ossl_quic_fifd_set0_qlog(&txp->fifd, qlog); } int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp, |