diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-11-15 17:10:31 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-11-15 17:10:31 -0500 |
| commit | 5d1a004e0dd0ef33f60985c47f86c255a3404a0f (patch) | |
| tree | fe4c6e583b19670a69e5b3ea8ae213b802957182 /src/or/relay.c | |
| parent | f503f3043673e6eb550c722b74e57b49d4443ae7 (diff) | |
| parent | 59f50c80d443a7e148f85cfed493e3e703cc4386 (diff) | |
| download | tor-5d1a004e0dd0ef33f60985c47f86c255a3404a0f.tar.gz tor-5d1a004e0dd0ef33f60985c47f86c255a3404a0f.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 29dc36194a..63119cbf07 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2149,15 +2149,19 @@ void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell, int wide_circ_ids) { + struct timeval now; packed_cell_t *copy = packed_cell_copy(cell, wide_circ_ids); + tor_gettimeofday_cached(&now); + copy->inserted_time = (uint32_t)tv_to_msec(&now); + /* Remember the time when this cell was put in the queue. */ + /*XXXX This may be obsoleted by inserted_time */ if (get_options()->CellStatistics) { - struct timeval now; uint32_t added; insertion_time_queue_t *it_queue = queue->insertion_times; if (!it_pool) it_pool = mp_pool_new(sizeof(insertion_time_elem_t), 1024); - tor_gettimeofday_cached(&now); + #define SECONDS_IN_A_DAY 86400L added = (uint32_t)(((now.tv_sec % SECONDS_IN_A_DAY) * 100L) + ((uint32_t)now.tv_usec / (uint32_t)10000L)); |