From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 25 Apr 2022 08:38:27 +0000 (+0200)
Subject: MINOR: quic: Do not send ACK frames when probing
X-Git-Tag: v2.6-dev8~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=337108ecda4bf43aaed36be9b1d8c02a64f19385;p=thirdparty%2Fhaproxy.git

MINOR: quic: Do not send ACK frames when probing

When we are probing, we do not receive packets, furthermore all ACK frames have
already been sent. This is useless to send ACK when probing the peer. This
modification does not reset the flag which marks the connection as requiring an
ACK frame to be sent. If this is the case, this will be taken into an account
by after the probing process.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 66ee198989..e11b8b6d2a 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -5720,7 +5720,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
 	head_len = pos - beg;
 	/* Build an ACK frame if required. */
 	ack_frm_len = 0;
-	if ((qel->pktns->flags & QUIC_FL_PKTNS_ACK_REQUIRED)) {
+	if ((qel->pktns->flags & QUIC_FL_PKTNS_ACK_REQUIRED) && !qel->pktns->tx.pto_probe) {
 	    BUG_ON(eb_is_empty(&qel->pktns->rx.arngs.root));
 		ack_frm.tx_ack.ack_delay = 0;
 		ack_frm.tx_ack.arngs = &qel->pktns->rx.arngs;