mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-15 06:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC CHANNEL: Only pump the demuxer once per tick

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
This commit is contained in:
Hugo Landau 2022-11-22 17:56:18 +00:00
parent 92282a17c9
commit 3bf4dc8c21
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ssl/quic/quic_channel.c
View File

@ -18,6 +18,7 @@
#define INIT_CRYPTO_BUF_LEN 8192
#define INIT_APP_BUF_LEN 8192
static void ch_rx_pre(QUIC_CHANNEL *ch);
static int ch_rx(QUIC_CHANNEL *ch);
static int ch_tx(QUIC_CHANNEL *ch);
static void ch_tick(QUIC_TICK_RESULT *res, void *arg);
@ -1007,8 +1008,11 @@ static void ch_tick(QUIC_TICK_RESULT *res, void *arg)
}
}
/* Handle any incoming data from network. */
ch_rx_pre(ch);
do {
/* Handle any incoming data from the network. */
/* Process queued incoming packets. */
ch_rx(ch);
/*
@ -1062,7 +1066,20 @@ static void ch_tick(QUIC_TICK_RESULT *res, void *arg)
res->want_net_write = (ossl_qtx_get_queue_len_datagrams(ch->qtx) > 0);
}
/* Process incoming packets and handle frames, if any. */
/* Process incoming datagrams, if any. */
static void ch_rx_pre(QUIC_CHANNEL *ch)
{
if (!ch->have_sent_any_pkt)
return;
/*
* Get DEMUX to BIO_recvmmsg from the network and queue incoming datagrams
* to the appropriate QRX instance.
*/
ossl_quic_demux_pump(ch->demux); /* best effort */
}
/* Process queued incoming packets and handle frames, if any. */
static int ch_rx(QUIC_CHANNEL *ch)
{
int handled_any = 0;
@ -1074,12 +1091,6 @@ static int ch_rx(QUIC_CHANNEL *ch)
*/
return 1;
/*
* Get DEMUX to BIO_recvmmsg from the network and queue incoming datagrams
* to the appropriate QRX instance.
*/
ossl_quic_demux_pump(ch->demux); /* best effort */
for (;;) {
assert(ch->qrx_pkt == NULL);