mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-22 22:25:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix an xxx021: do not remove routerinfos as too old and unlisted unless we have a consensus. Backport candidate.

Browse source 
svn:r17886
This commit is contained in:
Nick Mathewson 2009-01-04 19:47:12 +00:00
parent b5429e64c4
commit 360a059948
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -29,6 +29,8 @@ Changes in version 0.2.1.10-alpha - 2009-01-??
- If we are retrying something slowly over and over, do not
automatically give up after the 254th failure. Bugfix on
0.2.1.9-alpha.
- Do not remove routers as too old if we do not have any consensus
document. Bugfix on 0.2.0.7-alpha.
o Deprecated and removed features:
- The old "tor --version --version" command, which would spit out the

20
src/or/routerlist.c
View file

@ -3232,6 +3232,7 @@ routerlist_remove_old_routers(void)
int caches = directory_caches_dir_info(get_options());
const networkstatus_t *consensus = networkstatus_get_latest_consensus();
const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list();
int have_enough_v2;
trusted_dirs_remove_old_certs();
@ -3286,14 +3287,17 @@ routerlist_remove_old_routers(void)
digestset_add(retain, rs->descriptor_digest));
}
/* If we have nearly as many networkstatuses as we want, we should consider
* pruning current routers that are too old and that nobody recommends. (If
* we don't have enough networkstatuses, then we should get more before we
* decide to kill routers.) */
/* XXX021 we don't check if we have a v3 consensus, do we? should we? -RD */
if (!caches ||
(networkstatus_v2_list &&
smartlist_len(networkstatus_v2_list) > get_n_v2_authorities() / 2)) {
/* If we have a consensus, and nearly as many v2 networkstatuses as we want,
* we should consider pruning current routers that are too old and that
* nobody recommends. (If we don't have a consensus or enough v2
* networkstatuses, then we should get more before we decide to kill
* routers.) */
/* we set this to true iff we don't care about v2 info, or we have enough. */
have_enough_v2 = !caches ||
(networkstatus_v2_list &&
smartlist_len(networkstatus_v2_list) > get_n_v2_authorities() / 2);
if (have_enough_v2 && consensus) {
cutoff = now - ROUTER_MAX_AGE;
/* Remove too-old unrecommended members of routerlist->routers. */
for (i = 0; i < smartlist_len(routerlist->routers); ++i) {