From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Thu, 19 Aug 2021 05:53:27 +0000 (+0200)
Subject: MINOR: quic: Coalesce Application level packets with Handshake packets.
X-Git-Tag: v2.5-dev8~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d067088695933a5d7e16d6b86bf433a5741f5ac7;p=thirdparty%2Fhaproxy.git

MINOR: quic: Coalesce Application level packets with Handshake packets.

This simple enable use to coalesce Application level packet with
Handshake ones at the end of the handshake. This is highly useful
if we do want to send a short Handshake packet followed by Application
level ones.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 96b6a47694..f58715cb58 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -2101,7 +2101,7 @@ static int qc_prep_hdshk_pkts(struct qring *qr, struct ssl_sock_ctx *ctx)
 			/* Special case for Initial packets: when they have all
 			 * been sent, select the next level.
 			 */
-			if (tel == QUIC_TLS_ENC_LEVEL_INITIAL &&
+			if ((tel == QUIC_TLS_ENC_LEVEL_INITIAL || tel == QUIC_TLS_ENC_LEVEL_HANDSHAKE) &&
 			    (MT_LIST_ISEMPTY(&qel->pktns->tx.frms) || qc->els[next_tel].pktns->tx.in_flight)) {
 				tel = next_tel;
 				qel = &qc->els[tel];