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

move some code around when we're succeeding or failing at fetching

Browse Source 
server descs.
also clean up some formatting.


svn:r5153
This commit is contained in:
Roger Dingledine 2005-09-29 23:06:48 +00:00
parent 54a662a542
commit d4d8adaa6d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/or/directory.c
View File

@ -148,7 +148,8 @@ directory_post_to_dirservers(uint8_t purpose, const char *payload,
if (!fascist_firewall_allows_address(ds->addr,ds->dir_port)) if (!fascist_firewall_allows_address(ds->addr,ds->dir_port))
continue; continue;
} }
directory_initiate_command_trusted_dir(ds, purpose, purpose_is_private(purpose), directory_initiate_command_trusted_dir(ds, purpose,
purpose_is_private(purpose),
NULL, payload, payload_len); NULL, payload, payload_len);
}); });
} }
@ -216,9 +217,11 @@ directory_get_from_dirserver(uint8_t purpose, const char *resource,
} }
if (r) if (r)
directory_initiate_command_router(r, purpose, !directconn, resource, NULL, 0); directory_initiate_command_router(r, purpose, !directconn,
resource, NULL, 0);
else if (ds) else if (ds)
directory_initiate_command_trusted_dir(ds, purpose, !directconn, resource, NULL, 0); directory_initiate_command_trusted_dir(ds, purpose, !directconn,
resource, NULL, 0);
else { else {
log_fn(LOG_NOTICE,"No running dirservers known. Will try again later. (purpose %d)", log_fn(LOG_NOTICE,"No running dirservers known. Will try again later. (purpose %d)",
purpose); purpose);
@ -259,8 +262,9 @@ directory_initiate_command_trusted_dir(trusted_dir_server_t *dirserv,
const char *resource, const char *resource,
const char *payload, size_t payload_len) const char *payload, size_t payload_len)
{ {
directory_initiate_command(dirserv->address, dirserv->addr,dirserv->dir_port, directory_initiate_command(dirserv->address, dirserv->addr,
NULL, dirserv->digest, purpose, private_connection, resource, dirserv->dir_port, NULL, dirserv->digest, purpose,
private_connection, resource,
payload, payload_len); payload, payload_len);
} }
@ -964,7 +968,7 @@ connection_dir_client_reached_eof(connection_t *conn)
break; break;
} }
routers_update_all_from_networkstatus();/*launches router downloads*/ routers_update_all_from_networkstatus();/*launches router downloads*/
directory_info_has_arrived(time(NULL),0); directory_info_has_arrived(time(NULL), 0);
if (which) { if (which) {
if (smartlist_len(which)) { if (smartlist_len(which)) {
dir_networkstatus_download_failed(which); dir_networkstatus_download_failed(which);
@ -992,19 +996,19 @@ connection_dir_client_reached_eof(connection_t *conn)
"Received http status code %d (\"%s\") from server '%s:%d' while fetching \"/tor/server/%s\". I'll try again soon.", "Received http status code %d (\"%s\") from server '%s:%d' while fetching \"/tor/server/%s\". I'll try again soon.",
status_code, reason, conn->address, conn->port, status_code, reason, conn->address, conn->port,
conn->requested_resource); conn->requested_resource);
tor_free(body); tor_free(headers); tor_free(reason);
if (!which) { if (!which) {
connection_dir_download_routerdesc_failed(conn); connection_dir_download_routerdesc_failed(conn);
} else { } else {
dir_routerdesc_download_failed(which); dir_routerdesc_download_failed(which);
SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
smartlist_free(which); smartlist_free(which);
}
tor_free(body); tor_free(headers); tor_free(reason);
return -1; return -1;
} }
}
router_load_routers_from_string(body, 0, which);
directory_info_has_arrived(time(NULL),0);
if (which) { if (which) {
router_load_routers_from_string(body, 0, which);
directory_info_has_arrived(time(NULL), 0);
log_fn(LOG_NOTICE, "Received %d/%d routers.", log_fn(LOG_NOTICE, "Received %d/%d routers.",
n_asked_for-smartlist_len(which), n_asked_for); n_asked_for-smartlist_len(which), n_asked_for);
if (smartlist_len(which)) { if (smartlist_len(which)) {