diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-06 16:19:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-06 16:19:41 -0400 |
| commit | 13f60e16eb8639d812d50012dc364d4c061bcb04 (patch) | |
| tree | dab73209832d6823b40447c97b3ed423bf2e8429 /src/or/directory.c | |
| parent | f6cc8f0ee31d09bc082752d90d72c696cbfa45d0 (diff) | |
| parent | 22ec4d5426eecf1a8021d9b6b95f9a1518e96110 (diff) | |
| download | tor-13f60e16eb8639d812d50012dc364d4c061bcb04.tar.gz tor-13f60e16eb8639d812d50012dc364d4c061bcb04.zip | |
Merge remote-tracking branch 'public/bug2381'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 79edbc19cd..3b1fb02a54 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -631,9 +631,8 @@ connection_dir_request_failed(dir_connection_t *conn) connection_dir_bridge_routerdesc_failed(conn); connection_dir_download_routerdesc_failed(conn); } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) { - const char *flavname = - conn->requested_resource ? conn->requested_resource : "ns"; - networkstatus_consensus_download_failed(0, flavname); + if (conn->requested_resource) + networkstatus_consensus_download_failed(0, conn->requested_resource); } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE) { log_info(LD_DIR, "Giving up on certificate fetch from directory server " "at '%s'; retrying", @@ -1004,8 +1003,14 @@ directory_get_consensus_url(int supports_conditional_consensus, const char *resource) { char *url = NULL; - const char *hyphen = resource ? "-" : ""; - const char *flavor = resource ? resource : ""; + const char *hyphen, *flavor; + if (resource==NULL || strcmp(resource, "ns")==0) { + flavor = ""; /* Request ns consensuses as "", so older servers will work*/ + hyphen = ""; + } else { + flavor = resource; + hyphen = "-"; + } if (supports_conditional_consensus) { char *authority_id_list; @@ -1746,8 +1751,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) { int r; - const char *flavname = - conn->requested_resource ? conn->requested_resource : "ns"; + const char *flavname = conn->requested_resource; if (status_code != 200) { int severity = (status_code == 304) ? LOG_INFO : LOG_WARN; log(severity, LD_DIR, |