diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-10-05 02:25:59 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-10-05 02:25:59 +0000 |
| commit | 96c47c84781df94c8f8102094e8c028531921897 (patch) | |
| tree | 1a2578d68eba2b6c1290c6327a807bd05e41c102 | |
| parent | 509de69a7e7dde8165514b7f5c3685c33835969b (diff) | |
| download | tor-96c47c84781df94c8f8102094e8c028531921897.tar.gz tor-96c47c84781df94c8f8102094e8c028531921897.zip | |
Note the two places where clients will still try to fetch old-style (v1) directory info. These should be fixed, I think.
svn:r5193
| -rw-r--r-- | src/or/circuituse.c | 3 | ||||
| -rw-r--r-- | src/or/main.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d88db4ee01..664f3ac8c4 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -870,7 +870,8 @@ circuit_get_open_circ_or_launch(connection_t *conn, if (!has_fetched_directory) { if (!connection_get_by_type(CONN_TYPE_DIR)) { 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 * 1, or when all directory attempts fail and directory_all_unreachable() diff --git a/src/or/main.c b/src/or/main.c index 1030ce204b..ad55d9c483 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -946,8 +946,8 @@ do_hup(void) log_fn(LOG_NOTICE, "Error reloading fingerprints. Continuing with old list."); } } - /* Fetch a new directory. Even authdirservers do this. */ - 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*/ if (server_mode(options)) { const char *descriptor; /* Restart cpuworker and dnsworker processes, so they get up-to-date |