summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2024-04-04 12:04:26 +0100
committerHugo Landau <hlandau@openssl.org>2024-04-19 09:33:53 +0100
commitea5801df6ab3829afa62c1621ba8b6be60e899e1 (patch)
treedb92a7f42e74c4efd9f30e289f6a0259c78f6ca6
parent0fb05d699e2827895df5787c776402edd56f1383 (diff)
QUIC PORT: Ensure reactor waits for listening port correctly
Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24037)
-rw-r--r--ssl/quic/quic_impl.c1
-rw-r--r--ssl/quic/quic_port.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index a2036843dc..d8fc0c429f 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -364,7 +364,6 @@ err:
return ok;
}
-
static int expect_quic_cs(const SSL *s, QCTX *ctx)
{
return expect_quic_as(s, ctx, QCTX_C | QCTX_S);
diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c
index 6f5fb0f5b3..c3a31b06b0 100644
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -475,7 +475,7 @@ void ossl_quic_port_subtick(QUIC_PORT *port, QUIC_TICK_RESULT *res,
{
QUIC_CHANNEL *ch;
- res->net_read_desired = 0;
+ res->net_read_desired = ossl_quic_port_is_running(port);
res->net_write_desired = 0;
res->tick_deadline = ossl_time_infinite();