aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-05-01 11:25:25 -0400
committerDavid Goulet <dgoulet@torproject.org>2018-05-01 11:45:34 -0400
commit2d79d0155e3bdf42c2b8ff450d4d4bd85ee17c72 (patch)
treef6807a37b26fba453eb0f1db4c484906ebbafb5d /src/or/config.c
parente504b1b35831e9d18be7b89ab471705b41092606 (diff)
downloadtor-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/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 2b35138b6e..a2b84991a0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -104,6 +104,7 @@
#include "statefile.h"
#include "transports.h"
#include "ext_orport.h"
+#include "voting_schedule.h"
#ifdef _WIN32
#include <shlobj.h>
#endif
@@ -2359,7 +2360,7 @@ options_act(const or_options_t *old_options)
/* We may need to reschedule some directory stuff if our status changed. */
if (old_options) {
if (options_transition_affects_dirauth_timing(old_options, options)) {
- dirvote_recalculate_timing(options, time(NULL));
+ voting_schedule_recalculate_timing(options, time(NULL));
reschedule_dirvote(options);
}
if (!bool_eq(directory_fetches_dir_info_early(options),