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

Note the two places where clients will still try to fetch old-style (v1) directory info. These should be fixed, I think.

Browse Source 
svn:r5193
This commit is contained in:
Nick Mathewson 2005-10-05 02:25:59 +00:00
parent 509de69a7e
commit 96c47c8478
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/circuituse.c
View File

@ -870,7 +870,8 @@ circuit_get_open_circ_or_launch(connection_t *conn,
if (!has_fetched_directory) { if (!has_fetched_directory) {
if (!connection_get_by_type(CONN_TYPE_DIR)) { if (!connection_get_by_type(CONN_TYPE_DIR)) {
log(LOG_NOTICE,"Application request when we're believed to be offline. Optimistically trying again."); log(LOG_NOTICE,"Application request when we're believed to be offline. Optimistically trying again.");
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /* XXXX011 NM This should be a generic "retry all directory fetches". */
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /*XXXX011NM*/
} }
/* the stream will be dealt with when has_fetched_directory becomes /* the stream will be dealt with when has_fetched_directory becomes
* 1, or when all directory attempts fail and directory_all_unreachable() * 1, or when all directory attempts fail and directory_all_unreachable()

4
src/or/main.c
View File

@ -946,8 +946,8 @@ do_hup(void)
log_fn(LOG_NOTICE, "Error reloading fingerprints. Continuing with old list."); log_fn(LOG_NOTICE, "Error reloading fingerprints. Continuing with old list.");
} }
} }
/* Fetch a new directory. Even authdirservers do this. */ /* XXXX011 NM This should be a generic "retry all directory fetches". */
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /*XXXX011NM*/
if (server_mode(options)) { if (server_mode(options)) {
const char *descriptor; const char *descriptor;
/* Restart cpuworker and dnsworker processes, so they get up-to-date /* Restart cpuworker and dnsworker processes, so they get up-to-date