From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 14 Feb 2022 09:17:01 +0000 (+0100)
Subject: MINOR: quic: Wrong smoothed rtt initialization
X-Git-Tag: v2.6-dev2~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eca47d9a8aa2675578d743f7fb4dd93a0ef489d5;p=thirdparty%2Fhaproxy.git

MINOR: quic: Wrong smoothed rtt initialization

In ->srtt we store 8*srtt to ease the srtt computations with this formula:
    srtt = 7/8 * srtt + 1/8 * adjusted_rtt
But its initialization was wrong.
---

diff --git a/include/haproxy/quic_loss-t.h b/include/haproxy/quic_loss-t.h
index 5ca9b3a5e7..9230eec1f3 100644
--- a/include/haproxy/quic_loss-t.h
+++ b/include/haproxy/quic_loss-t.h
@@ -40,7 +40,7 @@
 struct quic_loss {
 	/* The most recent RTT measurement. */
 	unsigned int latest_rtt;
-	/* Smoothed RTT << 4*/
+	/* Smoothed RTT << 3 */
 	unsigned int srtt;
 	/* RTT variation << 2 */
 	unsigned int rtt_var;
diff --git a/include/haproxy/quic_loss.h b/include/haproxy/quic_loss.h
index cc48f0df58..0aea165ec3 100644
--- a/include/haproxy/quic_loss.h
+++ b/include/haproxy/quic_loss.h
@@ -35,7 +35,7 @@
 
 static inline void quic_loss_init(struct quic_loss *ql)
 {
-	ql->srtt = QUIC_LOSS_INITIAL_RTT << 4;
+	ql->srtt = QUIC_LOSS_INITIAL_RTT << 3;
 	ql->rtt_var = (QUIC_LOSS_INITIAL_RTT >> 1) << 2;
 	ql->rtt_min = 0;
 	ql->pto_count = 0;