nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make directory mirrors report non-zero dirreq-v[23]-shares again.

Browse Source
This commit is contained in:
Karsten Loesing 2010-06-21 10:13:17 +02:00
parent 741ab2a47a
commit 6bb8747ffb
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug1564 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes
- Make directory mirrors report non-zero dirreq-v[23]-shares again.
Fixes bug 1564; bugfix on 0.2.2.9-alpha.

11
src/or/routerlist.c
View File

@ -1652,7 +1652,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
// Cycle through smartlist and total the bandwidth. // Cycle through smartlist and total the bandwidth.
for (i = 0; i < (unsigned)smartlist_len(sl); ++i) { for (i = 0; i < (unsigned)smartlist_len(sl); ++i) {
int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0; int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0, is_me = 0;
double weight = 1; double weight = 1;
if (statuses) { if (statuses) {
routerstatus_t *status = smartlist_get(sl, i); routerstatus_t *status = smartlist_get(sl, i);
@ -1669,6 +1669,8 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
return NULL; return NULL;
} }
this_bw = kb_to_bytes(status->bandwidth); this_bw = kb_to_bytes(status->bandwidth);
if (router_digest_is_me(status->identity_digest))
is_me = 1;
} else { } else {
routerstatus_t *rs; routerstatus_t *rs;
routerinfo_t *router = smartlist_get(sl, i); routerinfo_t *router = smartlist_get(sl, i);
@ -1682,6 +1684,8 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
} 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);
} }
if (router_digest_is_me(router->cache_info.identity_digest))
is_me = 1;
} }
if (is_guard && is_exit) { if (is_guard && is_exit) {
weight = (is_dir ? Wdb*Wd : Wd); weight = (is_dir ? Wdb*Wd : Wd);
@ -1695,8 +1699,13 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
bandwidths[i] = weight*this_bw; bandwidths[i] = weight*this_bw;
weighted_bw += weight*this_bw; weighted_bw += weight*this_bw;
if (is_me)
sl_last_weighted_bw_of_me = weight*this_bw;
} }
/* XXXX022 this is a kludge to expose these values. */
sl_last_total_weighted_bw = weighted_bw;
log_debug(LD_CIRC, "Choosing node for rule %s based on weights " log_debug(LD_CIRC, "Choosing node for rule %s based on weights "
"Wg=%lf Wm=%lf We=%lf Wd=%lf with total bw %lf", "Wg=%lf Wm=%lf We=%lf Wd=%lf with total bw %lf",
bandwidth_weight_rule_to_string(rule), bandwidth_weight_rule_to_string(rule),