diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-12-01 04:58:53 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-12-01 04:58:53 +0000 |
| commit | f8df8d791e4a58ab65d8903a0522b4cfa55cc163 (patch) | |
| tree | 1fbc2c52fb8d95a0c638da65792609c50d253e5a /src/or/directory.c | |
| parent | 6d49465b691046efb0ffa2c7e89898cdd35ee192 (diff) | |
| download | tor-f8df8d791e4a58ab65d8903a0522b4cfa55cc163.tar tor-f8df8d791e4a58ab65d8903a0522b4cfa55cc163.tar.gz | |
start to refactor dirserver_mode()
svn:r12621
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index b0dd6a5a7..802cfedd0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -282,7 +282,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, { routerstatus_t *rs = NULL; or_options_t *options = get_options(); - int prefer_authority = server_mode(options) && dirserver_mode(options); + int prefer_authority = directory_fetches_from_authorities(options); int get_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose); authority_type_t type; int flags = retry_if_no_servers ? PDS_RETRY_IF_NO_SERVERS : 0; @@ -2982,8 +2982,7 @@ dir_routerdesc_download_failed(smartlist_t *failed, int status_code, { char digest[DIGEST_LEN]; time_t now = time(NULL); - or_options_t *options = get_options(); - int server = server_mode(options) && dirserver_mode(options); + int server = directory_fetches_from_authorities(get_options()); if (!was_descriptor_digests) { if (router_purpose == ROUTER_PURPOSE_BRIDGE) { tor_assert(!was_extrainfo); /* not supported yet */ |