Avoid struct timeval in QUIC code

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)

diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c
index dde882c64964d06f058b73b6b3926ce15bef9c06..b279cc184ad7ccf060760c8011d9ef6350c96a77 100644 (file)
--- a/ssl/quic/quic_ackm.c
+++ b/ssl/quic/quic_ackm.c
@@ -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)

diff --git a/ssl/quic/quic_statm.c b/ssl/quic/quic_statm.c
index cf402036c532ffd2c7602f3e8350186eee075fe8..62c4501fc933c81743c05b4c98ebe985890ecf30 100644 (file)
--- a/ssl/quic/quic_statm.c
+++ b/ssl/quic/quic_statm.c
@@ -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)
 {