From 5a5950e42d7060ee311e51438f4f16ad0effefd9 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Wed, 16 Oct 2024 11:05:51 +0200 Subject: [PATCH] MINOR: quic: notify connection layer on handshake completion Wake up connection layer on QUIC handshake completion via quic_conn_io_cb. Select SUB_RETRY_RECV as this was previously unused by QUIC MUX layer. For the moment, QUIC MUX never subscribes for handshake completion. However, this will be necessary for features such as the delaying of early data forwarding via wait-for-handshake. This patch will be necessary to implement wait-for-handshake support for QUIC. As such, it must be backported with next commits up to 2.6, after a mandatory period of observation. --- src/mux_quic.c | 3 ++- src/quic_conn.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mux_quic.c b/src/mux_quic.c index 13b058e07..e87b97e47 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -2701,7 +2701,8 @@ struct task *qcc_io_cb(struct task *t, void *ctx, unsigned int status) TRACE_ENTER(QMUX_EV_QCC_WAKE, qcc->conn); - qcc_io_send(qcc); + if (!(qcc->wait_event.events & SUB_RETRY_SEND)) + qcc_io_send(qcc); qcc_io_recv(qcc); diff --git a/src/quic_conn.c b/src/quic_conn.c index 37eaf940b..9701eaab2 100644 --- a/src/quic_conn.c +++ b/src/quic_conn.c @@ -861,6 +861,14 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state) * TODO implement discarding of 0-RTT keys */ } + + /* Wake up connection layer if on wait-for-handshake. */ + if (qc->subs && qc->subs->events & SUB_RETRY_RECV) { + tasklet_wakeup(qc->subs->tasklet); + qc->subs->events &= ~SUB_RETRY_RECV; + if (!qc->subs->events) + qc->subs = NULL; + } } /* Insert each QEL into sending list if needed. */ -- 2.47.3