1berry/openssl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QUIC QLOG: Use set0

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
This commit is contained in:
Hugo Landau 2024-02-01 11:00:55 +00:00
parent 5f603a12cd
commit b58abf9822
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/quic_fifd.h
View File

@ -78,7 +78,7 @@ void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd); /* (no-op) */
int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt);
void ossl_quic_fifd_set_qlog(QUIC_FIFD *fifd, QLOG *qlog);
void ossl_quic_fifd_set0_qlog(QUIC_FIFD *fifd, QLOG *qlog);
# endif

2
include/internal/quic_record_tx.h
View File

@ -69,7 +69,7 @@ void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback,
void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg);
/* Change QLOG instance in use after instantiation. */
void ossl_qtx_set_qlog(OSSL_QTX *qtx, QLOG *qlog);
void ossl_qtx_set0_qlog(OSSL_QTX *qtx, QLOG *qlog);
/*
* Secret Management

4
include/internal/quic_txp.h
View File

@ -141,8 +141,8 @@ int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
/*
* Change the QLOG instance in use after instantiation.
*/
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);
/*
* Inform the TX packetiser that an EL has been discarded. Idempotent.

4
ssl/quic/quic_channel.c
View File

@ -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,

2
ssl/quic/quic_fifd.c
View File

@ -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;
}

2
ssl/quic/quic_record_tx.c
View File

@ -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;
}

6
ssl/quic/quic_txp.c
View File

@ -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,