diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-07-03 16:45:25 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-19 05:03:11 +0200 |
| commit | 79a80f8b58bed854eb30a22e1643869dcc29e005 (patch) | |
| tree | 6fa87b13cdcbcede9b6a81bd21cc184b09cf063a | |
| parent | remove duplicate defines, add comment (diff) | |
| download | openssl-79a80f8b58bed854eb30a22e1643869dcc29e005.tar.xz openssl-79a80f8b58bed854eb30a22e1643869dcc29e005.zip | |
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)
| -rw-r--r-- | include/internal/quic_statm.h | 6 | ||||
| -rw-r--r-- | ssl/quic/quic_statm.c | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/include/internal/quic_statm.h b/include/internal/quic_statm.h index 6a12059e99..4ea60ff761 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 62c4501fc9..4e24fc11db 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; } |