From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 3 Jul 2023 14:45:25 +0000 (+0100)
Subject: QUIC STATM: Move max_ack_delay tracking out of STATM
X-Git-Tag: openssl-3.2.0-alpha1~397
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79a80f8b58bed854eb30a22e1643869dcc29e005;p=thirdparty%2Fopenssl.git

QUIC STATM: Move max_ack_delay tracking out of STATM

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21349)
---

diff --git a/include/internal/quic_statm.h b/include/internal/quic_statm.h
index 6a12059e99d..4ea60ff7610 100644
--- a/include/internal/quic_statm.h
+++ b/include/internal/quic_statm.h
@@ -16,13 +16,13 @@
 # ifndef OPENSSL_NO_QUIC
 
 typedef struct ossl_statm_st {
-    OSSL_TIME smoothed_rtt, latest_rtt, min_rtt, rtt_variance, max_ack_delay;
+    OSSL_TIME smoothed_rtt, latest_rtt, min_rtt, rtt_variance;
     char      have_first_sample;
 } OSSL_STATM;
 
 typedef struct ossl_rtt_info_st {
     /* As defined in RFC 9002. */
-    OSSL_TIME smoothed_rtt, latest_rtt, rtt_variance, min_rtt, max_ack_delay;
+    OSSL_TIME smoothed_rtt, latest_rtt, rtt_variance, min_rtt;
 } OSSL_RTT_INFO;
 
 int ossl_statm_init(OSSL_STATM *statm);
@@ -35,8 +35,6 @@ void ossl_statm_update_rtt(OSSL_STATM *statm,
                            OSSL_TIME ack_delay,
                            OSSL_TIME override_latest_rtt);
 
-void ossl_statm_set_max_ack_delay(OSSL_STATM *statm, OSSL_TIME max_ack_delay);
-
 # endif
 
 #endif
diff --git a/ssl/quic/quic_statm.c b/ssl/quic/quic_statm.c
index 62c4501fc93..4e24fc11db5 100644
--- a/ssl/quic/quic_statm.c
+++ b/ssl/quic/quic_statm.c
@@ -59,7 +59,6 @@ int ossl_statm_init(OSSL_STATM *statm)
     statm->min_rtt                  = ossl_time_infinite();
     statm->rtt_variance             = ossl_time_divide(K_INITIAL_RTT, 2);
     statm->have_first_sample        = 0;
-    statm->max_ack_delay            = ossl_time_infinite();
     return 1;
 }
 
@@ -68,16 +67,10 @@ void ossl_statm_destroy(OSSL_STATM *statm)
     /* No-op. */
 }
 
-void ossl_statm_set_max_ack_delay(OSSL_STATM *statm, OSSL_TIME max_ack_delay)
-{
-    statm->max_ack_delay = max_ack_delay;
-}
-
 void ossl_statm_get_rtt_info(OSSL_STATM *statm, OSSL_RTT_INFO *rtt_info)
 {
     rtt_info->min_rtt           = statm->min_rtt;
     rtt_info->latest_rtt        = statm->latest_rtt;
     rtt_info->smoothed_rtt      = statm->smoothed_rtt;
     rtt_info->rtt_variance      = statm->rtt_variance;
-    rtt_info->max_ack_delay     = statm->max_ack_delay;
 }