From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Dec 2017 15:48:37 +0000 (-0500)
Subject: Use monotime_coarse_absolute_msec() in destroy queue
X-Git-Tag: tor-0.2.9.15~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79a50afa0e3dd44fc5ef80806ccda501fab5a718;p=thirdparty%2Ftor.git

Use monotime_coarse_absolute_msec() in destroy queue

This way it will match the insert queue in 029 and later.
---

diff --git a/src/or/relay.c b/src/or/relay.c
index 3bf740348a..29f34ca033 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2417,14 +2417,11 @@ destroy_cell_queue_append(destroy_cell_queue_t *queue,
                           circid_t circid,
                           uint8_t reason)
 {
-  struct timeval now;
-
   destroy_cell_t *cell = tor_malloc_zero(sizeof(destroy_cell_t));
   cell->circid = circid;
   cell->reason = reason;
-  tor_gettimeofday_cached_monotonic(&now);
   /* Not yet used, but will be required for OOM handling. */
-  cell->inserted_time = (uint32_t)tv_to_msec(&now);
+  cell->inserted_time = (uint32_t) monotime_coarse_absolute_msec();
 
   TOR_SIMPLEQ_INSERT_TAIL(&queue->head, cell, next);
   ++queue->n;