summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-11 17:37:59 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-11 17:37:59 +0000
commit7870964e0cd919acabc08c915682d1033c2bf862 (patch)
tree8bc2df657b3fcb33dfb28b701b2c41503bde9a85 /src/or/directory.c
parent49e9c6d96b30a7604c2def15aff5d46a57350e5d (diff)
downloadtor-7870964e0cd919acabc08c915682d1033c2bf862.tar.gz
tor-7870964e0cd919acabc08c915682d1033c2bf862.zip
Don't reevaluate all the information from our consensus document
just because we've downloaded a v2 networkstatus that we intend to cache. Fixes bug 545. svn:r12479
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 8e6d3c9eec..34162ce6bc 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1448,7 +1448,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
} else
break;
}
- routers_update_all_from_networkstatus(now); /*launches router downloads*/
+ /* launches router downloads as needed */
+ routers_update_all_from_networkstatus(now, 2);
directory_info_has_arrived(now, 0);
if (which) {
if (smartlist_len(which)) {
@@ -1482,7 +1483,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
networkstatus_consensus_download_failed(0);
return -1;
}
- routers_update_all_from_networkstatus(now); /*launches router downloads*/
+ /* launches router downloads as needed */
+ routers_update_all_from_networkstatus(now, 3);
directory_info_has_arrived(now, 0);
log_info(LD_DIR, "Successfully loaded consensus.");
}