mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug1805' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-27 12:25:32 -04:00
commit 24a45f54d2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug1805 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Make sure we don't warn about not having bandwidth weights when
choosing bridges or other relays not in the consensus. Bugfix
on 0.2.2.10-alpha; fixes bug 1805.

10
src/or/routerlist.c
View File

@ -1610,6 +1610,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
double *bandwidths; double *bandwidths;
double tmp = 0; double tmp = 0;
unsigned int i; unsigned int i;
int have_unknown = 0; /* true iff sl contains element not in consensus. */
/* Can't choose exit and guard at same time */ /* Can't choose exit and guard at same time */
tor_assert(rule == NO_WEIGHTING || tor_assert(rule == NO_WEIGHTING ||
@ -1726,6 +1727,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
this_bw = kb_to_bytes(rs->bandwidth); this_bw = kb_to_bytes(rs->bandwidth);
} else { /* bridge or other descriptor not in our consensus */ } else { /* bridge or other descriptor not in our consensus */
this_bw = router_get_advertised_bandwidth_capped(router); this_bw = router_get_advertised_bandwidth_capped(router);
have_unknown = 1;
} }
if (router_digest_is_me(router->cache_info.identity_digest)) if (router_digest_is_me(router->cache_info.identity_digest))
is_me = 1; is_me = 1;
@ -1756,9 +1758,11 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
/* If there is no bandwidth, choose at random */ /* If there is no bandwidth, choose at random */
if (DBL_TO_U64(weighted_bw) == 0) { if (DBL_TO_U64(weighted_bw) == 0) {
log_warn(LD_CIRC, /* Don't warn when using bridges/relays not in the consensus */
"Weighted bandwidth is %lf in node selection for rule %s", if (!have_unknown)
weighted_bw, bandwidth_weight_rule_to_string(rule)); log_warn(LD_CIRC,
"Weighted bandwidth is %lf in node selection for rule %s",
weighted_bw, bandwidth_weight_rule_to_string(rule));
tor_free(bandwidths); tor_free(bandwidths);
return smartlist_choose(sl); return smartlist_choose(sl);
} }