diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-05-01 11:25:25 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-05-01 11:45:34 -0400 |
| commit | 2d79d0155e3bdf42c2b8ff450d4d4bd85ee17c72 (patch) | |
| tree | f6807a37b26fba453eb0f1db4c484906ebbafb5d /src/or/voting_schedule.c | |
| parent | e504b1b35831e9d18be7b89ab471705b41092606 (diff) | |
| download | tor-2d79d0155e3bdf42c2b8ff450d4d4bd85ee17c72.tar.gz tor-2d79d0155e3bdf42c2b8ff450d4d4bd85ee17c72.zip | |
vote: Move dirvote_recalculate_timing() to voting_schedule.c
By doing so, it is renamed to voting_schedule_recalculate_timing(). This
required a lot of changes to include voting_schedule.h everywhere that this
function was used.
This effectively now makes voting_schedule.{c|h} not include dirauth/dirvote.h
for that symbol and thus no dependency on the dirauth module anymore.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/voting_schedule.c')
| -rw-r--r-- | src/or/voting_schedule.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/voting_schedule.c b/src/or/voting_schedule.c index 88415993cc..b7676d5e79 100644 --- a/src/or/voting_schedule.c +++ b/src/or/voting_schedule.c @@ -15,8 +15,6 @@ #include "config.h" #include "networkstatus.h" -#include "dirauth/dirvote.h" - /* ===== * Vote scheduling * ===== */ @@ -143,7 +141,7 @@ voting_schedule_get_next_valid_after_time(void) * voting schedule can lead to bugs. */ if (tor_mem_is_zero((const char *) &voting_schedule, sizeof(voting_schedule))) { - dirvote_recalculate_timing(get_options(), time(NULL)); + voting_schedule_recalculate_timing(get_options(), time(NULL)); voting_schedule.created_on_demand = 1; } return voting_schedule.interval_starts; @@ -153,7 +151,7 @@ voting_schedule_get_next_valid_after_time(void) * doing. All type of tor do that because HS subsystem needs the timing as * well to function properly. */ void -dirvote_recalculate_timing(const or_options_t *options, time_t now) +voting_schedule_recalculate_timing(const or_options_t *options, time_t now) { voting_schedule_t *new_voting_schedule; |