From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Wed, 29 Dec 2021 15:00:47 +0000 (+0100)
Subject: MINOR: quic: Useless test in qc_prep_pkts()
X-Git-Tag: v2.6-dev1~176
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5732062cd23ba26e31254fe9f86040467afbff1a;p=thirdparty%2Fhaproxy.git

MINOR: quic: Useless test in qc_prep_pkts()

These tests were there to initiate PTO probing but they are not correct.
Furthermore they may break the PTO probing process and lead to useless packet
building.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 5dd977db2b..ae32e82e00 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -2497,8 +2497,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct qring *qr)
 			 * select the next level.
 			 */
 			if ((tel == QUIC_TLS_ENC_LEVEL_INITIAL || tel == QUIC_TLS_ENC_LEVEL_HANDSHAKE) &&
-			    (MT_LIST_ISEMPTY(&qel->pktns->tx.frms) ||
-			     (next_tel != QUIC_TLS_ENC_LEVEL_NONE && qc->els[next_tel].pktns->tx.in_flight))) {
+			    (MT_LIST_ISEMPTY(&qel->pktns->tx.frms))) {
 				/* If QUIC_TLS_ENC_LEVEL_HANDSHAKE was already reached let's try QUIC_TLS_ENC_LEVEL_APP */
 				if (tel == QUIC_TLS_ENC_LEVEL_HANDSHAKE && next_tel == tel)
 					next_tel = QUIC_TLS_ENC_LEVEL_APP;