commit 5fb6f656dfad3ddb178b76448742bfc3e2e834da Author: George Kadianakis desnacked@riseup.net Date: Thu Jun 14 15:38:14 2018 +0300
Use approx_time() instead of time(NULL) in some HS functions.
These were breaking our unittests. --- src/or/hs_service.c | 2 +- src/or/voting_schedule.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 76b163456..70d9c1c6f 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -433,7 +433,7 @@ service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) if (BUG(intro_point_max_lifetime < intro_point_min_lifetime)) { goto err; } - ip->time_to_expire = time(NULL) + + ip->time_to_expire = approx_time() + crypto_rand_int_range(intro_point_min_lifetime,intro_point_max_lifetime); }
diff --git a/src/or/voting_schedule.c b/src/or/voting_schedule.c index 6edde3f22..8c56a1052 100644 --- a/src/or/voting_schedule.c +++ b/src/or/voting_schedule.c @@ -168,7 +168,7 @@ voting_schedule_get_next_valid_after_time(void)
done: if (need_to_recalculate_voting_schedule) { - voting_schedule_recalculate_timing(get_options(), now); + voting_schedule_recalculate_timing(get_options(), approx_time()); voting_schedule.created_on_demand = 1; }