From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 4 Apr 2024 11:04:26 +0000 (+0100)
Subject: QUIC PORT: Ensure reactor waits for listening port correctly
X-Git-Tag: openssl-3.5.0-alpha1~409
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1ade90a662dc2bd1084307a639f964751127fce;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index d6a39fc9f8b..0d61bc949d6 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 52f17d3b317..594d37cb01a 100644
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -480,7 +480,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();