diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-12-08 00:04:29 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-12-08 00:04:29 +0000 |
| commit | e5be0504abe4d830247295d6c3ed9c6de92d2e16 (patch) | |
| tree | 0e64a2d9eb04c80a11f022aa949cd801b49b0d1d /src/or/circuitbuild.c | |
| parent | f31c16d993f1566d32ae8e1ba2aa29a242818e0c (diff) | |
| download | tor-e5be0504abe4d830247295d6c3ed9c6de92d2e16.tar.gz tor-e5be0504abe4d830247295d6c3ed9c6de92d2e16.zip | |
When the client is choosing entry guards, now it selects at most
one guard from a given relay family. Otherwise we could end up with
all of our entry points into the network run by the same operator.
Suggested by Camilo Viecco. Fix on 0.1.1.11-alpha.
Not a backport candidate, since I think this might break for users
who only have a given /16 in their reachableaddresses, or something
like that.
svn:r17514
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e7ab333e82..e16e1675d2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1658,8 +1658,10 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) if (options->UseEntryGuards && entry_guards) { SMARTLIST_FOREACH(entry_guards, entry_guard_t *, entry, { - if ((r = router_get_by_digest(entry->identity))) + if ((r = router_get_by_digest(entry->identity))) { smartlist_add(excluded, r); + routerlist_add_family(excluded, r); + } }); } |