nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

if you're a server and the auth dirservers are down, go to any other

Browse Source 
server. only give up hope on network reachability when no other servers
are reachable either.


svn:r3335
This commit is contained in:
Roger Dingledine 2005-01-10 17:39:41 +00:00
parent 74bc4e5af0
commit 45eb8d9660
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/or/directory.c
View File

@ -153,14 +153,17 @@ directory_get_from_dirserver(uint8_t purpose, const char *resource,
routerinfo_t *r = NULL;
trusted_dir_server_t *ds = NULL;
int fascistfirewall = get_options()->FascistFirewall;
int directconn = purpose == DIR_PURPOSE_FETCH_DIR ||
purpose == DIR_PURPOSE_FETCH_RUNNING_LIST;
int fetch_fresh_first = advertised_server_mode();
if (purpose == DIR_PURPOSE_FETCH_DIR ||
purpose == DIR_PURPOSE_FETCH_RUNNING_LIST) {
if (advertised_server_mode()) {
if (directconn) {
if (fetch_fresh_first) {
/* only ask authdirservers, and don't ask myself */
ds = router_pick_trusteddirserver(1, fascistfirewall,
retry_if_no_servers);
} else {
}
if (!ds) {
/* anybody with a non-zero dirport will do */
r = router_pick_directory_server(1, fascistfirewall,
purpose==DIR_PURPOSE_FETCH_RUNNING_LIST,
@ -184,8 +187,12 @@ directory_get_from_dirserver(uint8_t purpose, const char *resource,
else if (ds)
directory_initiate_command_trusted_dir(ds, purpose, resource, NULL, 0);
else {
log_fn(LOG_NOTICE,"No running dirservers known. Not trying. (purpose %d)", purpose);
directory_all_unreachable(time(NULL)); /* remember we tried them all and failed. */
log_fn(LOG_NOTICE,"No running dirservers known. Not trying. (purpose %d)",
purpose);
if(directconn) {
/* remember we tried them all and failed. */
directory_all_unreachable(time(NULL));
}
}
}