mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-12 20:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid struct timeval in QUIC code

Browse Source 
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19082)
This commit is contained in:
Pauli 2022-08-31 13:11:15 +10:00
parent f0131dc04a
commit 4fc04c71ac
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/quic/quic_ackm.c
View File

@ -1713,7 +1713,7 @@ int ossl_ackm_get_largest_unacked(OSSL_ACKM *ackm, int pkt_space, QUIC_PN *pn)
/* Number of ACK-eliciting packets RX'd before we always emit an ACK. */
#define PKTS_BEFORE_ACK 2
/* Maximum amount of time to leave an ACK-eliciting packet un-ACK'd. */
#define MAX_ACK_DELAY (OSSL_TIME_MS * 25)
#define MAX_ACK_DELAY ossl_ms2time(25)
/*
* Return 1 if emission of an ACK frame is currently desired.
@ -1865,13 +1865,12 @@ static void ackm_on_rx_ack_eliciting(OSSL_ACKM *ackm,
*/
if (ossl_time_is_infinite(ackm->rx_ack_flush_deadline[pkt_space]))
ackm_set_flush_deadline(ackm, pkt_space,
ossl_time_add(rx_time,
ossl_ticks2time(MAX_ACK_DELAY)));
ossl_time_add(rx_time, MAX_ACK_DELAY));
else
ackm_set_flush_deadline(ackm, pkt_space,
ossl_time_min(ackm->rx_ack_flush_deadline[pkt_space],
ossl_time_add(rx_time,
ossl_ticks2time(MAX_ACK_DELAY))));
MAX_ACK_DELAY)));
}
int ossl_ackm_on_rx_packet(OSSL_ACKM *ackm, const OSSL_ACKM_RX_PKT *pkt)

2
ssl/quic/quic_statm.c
View File

@ -50,7 +50,7 @@ void ossl_statm_update_rtt(OSSL_STATM *statm,
}
/* RFC 9002 kInitialRtt value. RFC recommended value. */
#define K_INITIAL_RTT (ossl_ticks2time(333 * OSSL_TIME_MS))
#define K_INITIAL_RTT ossl_ms2time(333)
int ossl_statm_init(OSSL_STATM *statm)
{