]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: quic: Coalesce Application level packets with Handshake packets.
authorFrédéric Lécaille <flecaille@haproxy.com>
Thu, 19 Aug 2021 05:53:27 +0000 (07:53 +0200)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 23 Sep 2021 13:27:25 +0000 (15:27 +0200)
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.

src/xprt_quic.c

index 96b6a47694e0cc27e3a4f017e8bfb1cf8b28b694..f58715cb5808d93e2ef66e0b0f17e45fd69fd252 100644 (file)
@@ -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];