From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Wed, 19 Jan 2022 17:54:18 +0000 (+0100)
Subject: MINOR: quic: Probe even if coalescing
X-Git-Tag: v2.6-dev1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94fca87f6ac0d33e14a4505f9e6fdc61a12202e4;p=thirdparty%2Fhaproxy.git

MINOR: quic: Probe even if coalescing

Again, we fix a reminiscence of the way we probed before probing by packet.
When we were probing by datagram we inspected <prv_pkt> to know if we were
coalescing several packets. There is no need to do that at all when probing by packet.
Furthermore this could lead to blocking situations where we want to probe but
are limited by the congestion control (<cwnd> path variable). This must not be
the case. When probing we must do it regardless of the congestion control.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 26d08ebb14..469910edd4 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -2553,8 +2553,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct qring *qr,
 		probe = ack = 0;
 		cc =  HA_ATOMIC_LOAD(&qc->flags) & QUIC_FL_CONN_IMMEDIATE_CLOSE;
 		if (!cc) {
-			if (!prv_pkt)
-				probe = qel->pktns->tx.pto_probe;
+			probe = qel->pktns->tx.pto_probe;
 			ack = HA_ATOMIC_BTR(&qel->pktns->flags, QUIC_FL_PKTNS_ACK_REQUIRED_BIT);
 		}
 		/* Do not build any more packet if the TX secrets are not available or