summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-08-17 01:29:58 +0000
committerRoger Dingledine <arma@torproject.org>2007-08-17 01:29:58 +0000
commit3f186e6510f0df216ee1f807922745b21c791c68 (patch)
tree942b841b5a5825e618a15706327794c41b1eb383 /src/or/main.c
parent357b4645cf1e01e0b8790b0739d36221eb2bb3d0 (diff)
downloadtor-3f186e6510f0df216ee1f807922745b21c791c68.tar.gz
tor-3f186e6510f0df216ee1f807922745b21c791c68.zip
help nick work on proposal 108
svn:r11148
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 3ccad90adc..aae07dfcf5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -929,7 +929,7 @@ run_scheduled_events(time_t now)
if (now % 10 == 0 && (authdir_mode_tests_reachability(options)) &&
!we_are_hibernating()) {
/* try to determine reachability of the other Tor servers */
- dirserv_test_reachability(0);
+ dirserv_test_reachability(now, 0);
}
/** 1d. DOCDOC */
@@ -1322,6 +1322,7 @@ static int
do_main_loop(void)
{
int loop_result;
+ time_t now;
/* initialize dns resolve map, spawn workers if needed */
if (dns_init() < 0) {
@@ -1361,11 +1362,12 @@ do_main_loop(void)
if (router_reload_consensus_networkstatus()) {
return -1;
}
- directory_info_has_arrived(time(NULL),1);
+ now = time(NULL);
+ directory_info_has_arrived(now, 1);
if (authdir_mode_tests_reachability(get_options())) {
/* the directory is already here, run startup things */
- dirserv_test_reachability(1);
+ dirserv_test_reachability(now, 1);
}
if (server_mode(get_options())) {