diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-09-30 02:08:57 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-09-30 02:08:57 +0000 |
| commit | 13e709a0ff0179124c6c35858a3cf3f0b9f8789b (patch) | |
| tree | d75731f57fd4e8ea53fd4354752b1a4cedb69a34 | |
| parent | 26e7a05725bcb2cea59401803371ee3fa688a8f6 (diff) | |
| download | tor-13e709a0ff0179124c6c35858a3cf3f0b9f8789b.tar.gz tor-13e709a0ff0179124c6c35858a3cf3f0b9f8789b.zip | |
resolve nick's comment
svn:r5163
| -rw-r--r-- | src/or/directory.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 6d1f8ecf0d..7a2e80f614 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1008,20 +1008,10 @@ connection_dir_client_reached_eof(connection_t *conn) tor_free(body); tor_free(headers); tor_free(reason); return -1; } - if (which) { - /* We only call these if it's a "fp/" request, since - * it's the only way we'll be adding new server descriptors - * and thus the only way we'd affect has_fetched_directory. - * - * XXXX Not so. We will fetch "all" routers if we have zero or one - * networkstatus, so we can bootstrap faster. See - * update_router_descriptor_downloads(). One of these behaviors is - * wrong. - **/ - - /* as we learn from them, we remove them from 'which' */ - router_load_routers_from_string(body, 0, which); - directory_info_has_arrived(time(NULL), 0); + /* as we learn from them, we remove them from 'which' */ + router_load_routers_from_string(body, 0, which); + directory_info_has_arrived(time(NULL), 0); + if (which) { /* mark remaining ones as failed */ log_fn(LOG_NOTICE, "Received %d/%d routers.", n_asked_for-smartlist_len(which), n_asked_for); if (smartlist_len(which)) { |