Ignore tiny bandwidths entirely when computing thresholds

Another bug 8145 fix.
This commit is contained in:
Nick Mathewson
2013-02-04 10:47:08 -05:00
parent 317d16de04
commit 61995d3e2c
2 changed files with 10 additions and 1 deletions
+3
View File
@@ -5,3 +5,6 @@
- When computing thresholds for flags, never let the threshold for
the Fast flag to 4096 bytes. Fixes bug 8145.
- Do not consider nodes with extremely low bandwidths when deciding
thresholds for various directory flags. Another fix for 8145.
+7 -1
View File
@@ -1884,6 +1884,10 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
node->is_running);
}
/** Don't consider routers with less bandwidth than this when computing
* thresholds. */
#define ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER 4096
/** Helper for dirserv_compute_performance_thresholds(): Decide whether to
* include a router in our calculations, and return true iff we should. */
static int
@@ -1891,7 +1895,9 @@ router_counts_toward_thresholds(const node_t *node, time_t now,
const digestmap_t *omit_as_sybil)
{
return node->ri && router_is_active(node->ri, node, now) &&
!digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest);
!digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) &&
(router_get_advertised_bandwidth(node->ri) >=
ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER);
}
/** Look through the routerlist, the Mean Time Between Failure history, and