aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-20 13:34:57 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-20 13:34:57 -0400
commita660fe6fd51cd511cdc610e4a50f06d59cbf74aa (patch)
tree24151e9895db0e480580a00d5f3a1c1b7314a7ed /src/or/dirserv.c
parent90d2162f32f511f23449211ad900a880fd384afb (diff)
downloadtor-a660fe6fd51cd511cdc610e4a50f06d59cbf74aa.tar
tor-a660fe6fd51cd511cdc610e4a50f06d59cbf74aa.tar.gz
Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG
This adds a new option to fix bug 8508 which broke chutney networks. The bug was introduced by 317d16de.
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 8e8f79a17..81f328a64 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2005,6 +2005,9 @@ dirserv_compute_performance_thresholds(routerlist_t *rl,
ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG,
ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG,
INT32_MAX);
+ if (options->TestingTorNetwork) {
+ min_fast = (int32_t)options->TestingMinFastFlagThreshold;
+ }
max_fast = networkstatus_get_param(NULL, "FastFlagMaxThreshold",
INT32_MAX, min_fast, INT32_MAX);
if (fast_bandwidth < (uint32_t)min_fast)