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: Minor fixups

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21029)
This commit is contained in:
Hugo Landau 2023-06-12 14:13:26 +01:00 committed by Pauli
parent 29a541fe36
commit 692a3cab11
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssl/quic/quic_channel.c
View File

@ -187,7 +187,6 @@ static int ch_init(QUIC_CHANNEL *ch)
ch->cc_method, ch->cc_data)) == NULL)
goto err;
if (!ossl_quic_stream_map_init(&ch->qsm, get_stream_limit, ch,
&ch->max_streams_bidi_rxfc,
&ch->max_streams_uni_rxfc,
@ -708,7 +707,7 @@ static void rxku_detected(QUIC_PN pn, void *arg)
* if transmission of application data is going in only one direction and
* nothing else is happening with the connection. However, since the peer
* cannot initiate a subsequent (spontaneous) TXKU until its prior
* (spontaneous or solicited) TXKU has completed - meaning that that prior
* (spontaneous or solicited) TXKU has completed - meaning that prior
* TXKU's trigger packet (or subsequent packet) has been acknowledged, this
* can lead to very long times before a TXKU is considered 'completed'.
* Optimise this by forcing ACK generation after triggering TXKU.
@ -2897,3 +2896,13 @@ uint64_t ossl_quic_channel_get_rx_key_epoch(QUIC_CHANNEL *ch)
{
return ossl_qrx_get_key_epoch(ch->qrx);
}
int ossl_quic_channel_trigger_txku(QUIC_CHANNEL *ch)
{
if (!txku_allowed(ch))
return 0;
ch->ku_locally_initiated = 1;
ch_trigger_txku(ch);
return 1;
}

2
ssl/quic/quic_record_rx.c
View File

@ -743,7 +743,7 @@ static ossl_inline void ignore_res(int x)
static void qrx_key_update_initiated(OSSL_QRX *qrx, QUIC_PN pn)
{
if (!ossl_qrl_enc_level_set_key_update(&qrx->el_set, QUIC_ENC_LEVEL_1RTT))
/* Returns 0 if already in RXKU, so we don't call callback again. */
/* We are already in RXKU, so we don't call the callback again. */
return;
if (qrx->key_update_cb != NULL)