diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-11 09:48:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-11 09:48:38 -0400 |
| commit | 3799ce7970a5d1fe21ce2921c763f06e4369cfee (patch) | |
| tree | 2857b7527746c518f0e340e4d483f62dd856c45b /src/or/routerlist.c | |
| parent | 7dcd105be34a4f44948383d21b5ee2eb4a3cbdd2 (diff) | |
| parent | 64c8e8edda5a7f3525a1ab365c4bd72b19212322 (diff) | |
| download | tor-3799ce7970a5d1fe21ce2921c763f06e4369cfee.tar.gz tor-3799ce7970a5d1fe21ce2921c763f06e4369cfee.zip | |
Merge branch 'bug2797'
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 15f643cf79..00557a26e9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1132,7 +1132,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) if ((type & MICRODESC_DIRINFO) && !is_trusted && !node->rs->version_supports_microdesc_cache) continue; - if (try_excluding && options->ExcludeNodes && + if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) { ++n_excluded; @@ -1237,7 +1237,7 @@ router_pick_trusteddirserver_impl(dirinfo_type_t type, int flags, continue; if (requireother && me && router_digest_is_me(d->digest)) continue; - if (try_excluding && options->ExcludeNodes && + if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, &d->fake_status, -1)) { ++n_excluded; @@ -5567,7 +5567,8 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, const char *nickname, const char *id_digest, country_t country) { - if (!set || !set->list) return 0; + if (!set || !set->list) + return 0; if (nickname && strmap_get_lc(set->names, nickname)) return 4; if (id_digest && digestmap_get(set->digests, id_digest)) |