From c2786c8ea732592f708e588f0f5849716914a313 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 22 May 2023 15:00:00 +0100 Subject: [PATCH] Rename msg_callback_s to msg_callback_ssl for greater clarity Reviewed-by: Tomas Mraz Reviewed-by: Hugo Landau (Merged from https://github.com/openssl/openssl/pull/20914) --- include/internal/quic_channel.h | 2 +- include/internal/quic_record_rx.h | 2 +- include/internal/quic_record_tx.h | 2 +- include/internal/quic_txp.h | 2 +- ssl/quic/quic_channel.c | 10 +++++----- ssl/quic/quic_channel_local.h | 2 +- ssl/quic/quic_record_rx.c | 11 ++++++----- ssl/quic/quic_record_tx.c | 10 +++++----- ssl/quic/quic_rx_depack.c | 2 +- ssl/quic/quic_txp.c | 8 ++++---- 10 files changed, 26 insertions(+), 25 deletions(-) diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h index 74ee125f34..25b6758d8d 100644 --- a/include/internal/quic_channel.h +++ b/include/internal/quic_channel.h @@ -326,7 +326,7 @@ int ossl_quic_channel_replace_local_cid(QUIC_CHANNEL *ch, /* Setters for the msg_callback and msg_callback_arg */ void ossl_quic_channel_set_msg_callback(QUIC_CHANNEL *ch, ossl_msg_cb msg_callback, - SSL *msg_callback_s); + SSL *msg_callback_ssl); void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch, void *msg_callback_arg); diff --git a/include/internal/quic_record_rx.h b/include/internal/quic_record_rx.h index b86d9a98b5..ece16a3bfc 100644 --- a/include/internal/quic_record_rx.h +++ b/include/internal/quic_record_rx.h @@ -62,7 +62,7 @@ void ossl_qrx_free(OSSL_QRX *qrx); /* Setters for the msg_callback and msg_callback_arg */ void ossl_qrx_set_msg_callback(OSSL_QRX *qrx, ossl_msg_cb msg_callback, - SSL *msg_callback_s); + SSL *msg_callback_ssl); void ossl_qrx_set_msg_callback_arg(OSSL_QRX *qrx, void *msg_callback_arg); diff --git a/include/internal/quic_record_tx.h b/include/internal/quic_record_tx.h index a12c3abe00..8b4e1705cb 100644 --- a/include/internal/quic_record_tx.h +++ b/include/internal/quic_record_tx.h @@ -60,7 +60,7 @@ void ossl_qtx_set_mutator(OSSL_QTX *qtx, ossl_mutate_packet_cb mutatecb, /* Setters for the msg_callback and the msg_callback_arg */ void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback, - SSL *msg_callback_s); + SSL *msg_callback_ssl); void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg); /* diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h index ad1c06f31e..b8740f5440 100644 --- a/include/internal/quic_txp.h +++ b/include/internal/quic_txp.h @@ -170,7 +170,7 @@ int ossl_quic_tx_packetiser_schedule_conn_close(OSSL_QUIC_TX_PACKETISER *txp, /* Setters for the msg_callback and msg_callback_arg */ void ossl_quic_tx_packetiser_set_msg_callback(OSSL_QUIC_TX_PACKETISER *txp, ossl_msg_cb msg_callback, - SSL *msg_callback_s); + SSL *msg_callback_ssl); void ossl_quic_tx_packetiser_set_msg_callback_arg(OSSL_QUIC_TX_PACKETISER *txp, void *msg_callback_arg); diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index 328c8bee8b..d75ac4c334 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -2512,14 +2512,14 @@ int ossl_quic_channel_replace_local_cid(QUIC_CHANNEL *ch, void ossl_quic_channel_set_msg_callback(QUIC_CHANNEL *ch, ossl_msg_cb msg_callback, - SSL *msg_callback_s) + SSL *msg_callback_ssl) { ch->msg_callback = msg_callback; - ch->msg_callback_s = msg_callback_s; - ossl_qtx_set_msg_callback(ch->qtx, msg_callback, msg_callback_s); + ch->msg_callback_ssl = msg_callback_ssl; + ossl_qtx_set_msg_callback(ch->qtx, msg_callback, msg_callback_ssl); ossl_quic_tx_packetiser_set_msg_callback(ch->txp, msg_callback, - msg_callback_s); - ossl_qrx_set_msg_callback(ch->qrx, msg_callback, msg_callback_s); + msg_callback_ssl); + ossl_qrx_set_msg_callback(ch->qrx, msg_callback, msg_callback_ssl); } void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch, diff --git a/ssl/quic/quic_channel_local.h b/ssl/quic/quic_channel_local.h index ad2c0b458a..b945f36542 100644 --- a/ssl/quic/quic_channel_local.h +++ b/ssl/quic/quic_channel_local.h @@ -96,7 +96,7 @@ struct quic_channel_st { /* Message callback related arguments */ ossl_msg_cb msg_callback; void *msg_callback_arg; - SSL *msg_callback_s; + SSL *msg_callback_ssl; /* * Send and receive parts of the crypto streams. diff --git a/ssl/quic/quic_record_rx.c b/ssl/quic/quic_record_rx.c index db70c119fa..fad678a41e 100644 --- a/ssl/quic/quic_record_rx.c +++ b/ssl/quic/quic_record_rx.c @@ -150,7 +150,7 @@ struct ossl_qrx_st { /* Message callback related arguments */ ossl_msg_cb msg_callback; void *msg_callback_arg; - SSL *msg_callback_s; + SSL *msg_callback_ssl; }; static void qrx_on_rx(QUIC_URXE *urxe, void *arg); @@ -234,7 +234,8 @@ void ossl_qrx_inject_urxe(OSSL_QRX *qrx, QUIC_URXE *urxe) if (qrx->msg_callback != NULL) qrx->msg_callback(0, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_DATAGRAM, urxe + 1, - urxe->data_len, qrx->msg_callback_s, qrx->msg_callback_arg); + urxe->data_len, qrx->msg_callback_ssl, + qrx->msg_callback_arg); } static void qrx_on_rx(QUIC_URXE *urxe, void *arg) @@ -845,7 +846,7 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe, if (qrx->msg_callback != NULL) qrx->msg_callback(0, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_PACKET, sop, - eop - sop - rxe->hdr.len, qrx->msg_callback_s, + eop - sop - rxe->hdr.len, qrx->msg_callback_ssl, qrx->msg_callback_arg); /* @@ -1206,10 +1207,10 @@ uint64_t ossl_qrx_get_max_forged_pkt_count(OSSL_QRX *qrx, } void ossl_qrx_set_msg_callback(OSSL_QRX *qrx, ossl_msg_cb msg_callback, - SSL *msg_callback_s) + SSL *msg_callback_ssl) { qrx->msg_callback = msg_callback; - qrx->msg_callback_s = msg_callback_s; + qrx->msg_callback_ssl = msg_callback_ssl; } void ossl_qrx_set_msg_callback_arg(OSSL_QRX *qrx, void *msg_callback_arg) diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c index 09862c7751..69a5ebea54 100644 --- a/ssl/quic/quic_record_tx.c +++ b/ssl/quic/quic_record_tx.c @@ -98,7 +98,7 @@ struct ossl_qtx_st { /* Message callback related arguments */ ossl_msg_cb msg_callback; void *msg_callback_arg; - SSL *msg_callback_s; + SSL *msg_callback_ssl; }; /* Instantiates a new QTX. */ @@ -452,7 +452,7 @@ static int qtx_write_hdr(OSSL_QTX *qtx, const QUIC_PKT_HDR *hdr, TXE *txe, if (qtx->msg_callback != NULL) qtx->msg_callback(1, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_PACKET, data, l, - qtx->msg_callback_s, qtx->msg_callback_arg); + qtx->msg_callback_ssl, qtx->msg_callback_arg); txe->data_len += l; @@ -911,7 +911,7 @@ int ossl_qtx_flush_net(OSSL_QTX *qtx) if (qtx->msg_callback != NULL) qtx->msg_callback(1, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_DATAGRAM, msg[i].data, msg[i].data_len, - qtx->msg_callback_s, + qtx->msg_callback_ssl, qtx->msg_callback_arg); qtx_pending_to_free(qtx); } @@ -1004,10 +1004,10 @@ uint64_t ossl_qtx_get_max_epoch_pkt_count(OSSL_QTX *qtx, uint32_t enc_level) } void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback, - SSL *msg_callback_s) + SSL *msg_callback_ssl) { qtx->msg_callback = msg_callback; - qtx->msg_callback_s = msg_callback_s; + qtx->msg_callback_ssl = msg_callback_ssl; } void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg) diff --git a/ssl/quic/quic_rx_depack.c b/ssl/quic/quic_rx_depack.c index 740f95f23a..f22e658e8a 100644 --- a/ssl/quic/quic_rx_depack.c +++ b/ssl/quic/quic_rx_depack.c @@ -1107,7 +1107,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt, } ch->msg_callback(0, OSSL_QUIC1_VERSION, ctype, sof, framelen, - ch->msg_callback_s, ch->msg_callback_arg); + ch->msg_callback_ssl, ch->msg_callback_arg); } } diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c index b04fe01115..24a123d116 100644 --- a/ssl/quic/quic_txp.c +++ b/ssl/quic/quic_txp.c @@ -73,7 +73,7 @@ struct ossl_quic_tx_packetiser_st { /* Message callback related arguments */ ossl_msg_cb msg_callback; void *msg_callback_arg; - SSL *msg_callback_s; + SSL *msg_callback_ssl; }; @@ -325,7 +325,7 @@ static int tx_helper_commit(struct tx_helper *h) ctype = SSL3_RT_QUIC_FRAME_HEADER; h->txp->msg_callback(1, OSSL_QUIC1_VERSION, ctype, h->txn.data, l, - h->txp->msg_callback_s, + h->txp->msg_callback_ssl, h->txp->msg_callback_arg); } @@ -2385,10 +2385,10 @@ int ossl_quic_tx_packetiser_schedule_conn_close(OSSL_QUIC_TX_PACKETISER *txp, void ossl_quic_tx_packetiser_set_msg_callback(OSSL_QUIC_TX_PACKETISER *txp, ossl_msg_cb msg_callback, - SSL *msg_callback_s) + SSL *msg_callback_ssl) { txp->msg_callback = msg_callback; - txp->msg_callback_s = msg_callback_s; + txp->msg_callback_ssl = msg_callback_ssl; } void ossl_quic_tx_packetiser_set_msg_callback_arg(OSSL_QUIC_TX_PACKETISER *txp,