From d43f07b649d27792d386c2e0712ad6f70d28b202 Mon Sep 17 00:00:00 2001 From: Frederic Lecaille Date: Sat, 2 Aug 2025 10:33:05 +0200 Subject: [PATCH] MINOR: quic-be: qc_send_mux() adaptation for 0-RTT When entering this function, a selection is done about the encryption level to be used to send data. For a client, the early data encryption level is used to send 0-RTT if this encryption level is initialized. The Initial encryption is also registered to the send list for clients if there is Initial crypto data to send. This allow Initial and 0-RTT packets to be coalesced by datagrams. --- src/quic_tx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/quic_tx.c b/src/quic_tx.c index f74703438..59485c58d 100644 --- a/src/quic_tx.c +++ b/src/quic_tx.c @@ -495,6 +495,8 @@ enum quic_tx_err qc_send_mux(struct quic_conn *qc, struct list *frms, struct list send_list = LIST_HEAD_INIT(send_list); enum quic_tx_err ret = QUIC_TX_ERR_NONE; int max_dgram = 0, sent; + struct quic_enc_level *qel = objt_listener(qc->target) ? qc->ael : + qc->eel ? qc->eel : qc->ael; TRACE_ENTER(QUIC_EV_CONN_TXPKT, qc); BUG_ON(qc->mux_state != QC_MUX_READY); /* Only MUX can uses this function so it must be ready. */ @@ -505,6 +507,10 @@ enum quic_tx_err qc_send_mux(struct quic_conn *qc, struct list *frms, return QUIC_TX_ERR_FATAL; } + /* The QUIC client may need to send Initial CRYPTO data before early data. */ + if (objt_server(qc->target) && qel == qc->eel && qel_need_sending(qc->iel, qc)) + qel_register_send(&send_list, qc->iel, &qc->iel->pktns->tx.frms); + /* Try to send post handshake frames first unless on 0-RTT. */ if ((qc->flags & QUIC_FL_CONN_NEED_POST_HANDSHAKE_FRMS) && qc->state >= QUIC_HS_ST_COMPLETE) { @@ -519,7 +525,7 @@ enum quic_tx_err qc_send_mux(struct quic_conn *qc, struct list *frms, } TRACE_STATE("preparing data (from MUX)", QUIC_EV_CONN_TXPKT, qc); - qel_register_send(&send_list, qc->ael, frms); + qel_register_send(&send_list, qel, frms); sent = qc_send(qc, 0, &send_list, max_dgram); if (pacer && qc->path->cc.algo->check_app_limited)