summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-19 20:56:57 -0400
committerRoger Dingledine <arma@torproject.org>2009-12-21 03:52:31 -0500
commit1a65bdd2327f671bb4bb4f5828de10d1f2042f10 (patch)
treeca1145fbd1d7c12e29b045d84e0d2d3a5243c1ff /src/or/directory.c
parent580066f2f6fb9be141edab80396035f43895ac6f (diff)
downloadtor-1a65bdd2327f671bb4bb4f5828de10d1f2042f10.tar.gz
tor-1a65bdd2327f671bb4bb4f5828de10d1f2042f10.zip
Make EntryNodes config option much more aggressive.
Before it would prepend your requested entrynodes to your list of guard nodes, but feel free to use others after that. Now it chooses only from your EntryNodes if any of those are available, and only falls back to others if a) they're all down and b) StrictNodes is not set. Also, now we refresh your entry guards from EntryNode at each consensus fetch (rather than just at startup and then they slowly rot as the network changes). The goal here is to make users less likely to set StrictNodes, since it's doing closer to what they expect it should be doing.
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 282cd98165..e5bae2061e 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -557,7 +557,7 @@ connection_dir_request_failed(dir_connection_t *conn)
if (directory_conn_is_self_reachability_test(conn)) {
return; /* this was a test fetch. don't retry. */
}
- if (entry_list_can_grow(get_options()))
+ if (entry_list_is_constrained(get_options()))
router_set_status(conn->identity_digest, 0); /* don't try him again */
if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) {
log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",