summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2016-11-08 16:39:36 +1100
committerteor <teor2345@gmail.com>2016-11-08 16:42:26 +1100
commit38e3f91c6388bc676c0007b009488ffcc2496bc8 (patch)
treec269f7463ca0868a89739d7d5100acce795506b4
parent3dfecffa7d6a3ab268983b9477cf36a01e7353f6 (diff)
downloadtor-38e3f91c6388bc676c0007b009488ffcc2496bc8.tar.gz
tor-38e3f91c6388bc676c0007b009488ffcc2496bc8.zip
When using exponential backoff in test networks, use a lower exponent
Lower exponents mean that delays do not vary as much. This helps test networks bootstrap consistently. Bugfix on 20499.
-rw-r--r--changes/bug205975
-rw-r--r--src/or/directory.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/changes/bug20597 b/changes/bug20597
new file mode 100644
index 0000000000..f199b63933
--- /dev/null
+++ b/changes/bug20597
@@ -0,0 +1,5 @@
+ o Minor bugfixes (test networks, exponential backoff):
+ - When using exponential backoff in test networks, use a lower exponent,
+ so the delays do not vary as much. This helps test networks bootstrap
+ consistently. Fixes bug 20597; bugfix on 20499; not in any released
+ version of tor.
diff --git a/src/or/directory.c b/src/or/directory.c
index 1f399818c4..f4fd521929 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3796,7 +3796,12 @@ next_random_exponential_delay(int delay, int max_delay)
/* How much are we willing to add to the delay? */
int max_increment;
- const int multiplier = 3; /* no more than quadruple the previous delay */
+ int multiplier = 3; /* no more than quadruple the previous delay */
+ if (get_options()->TestingTorNetwork) {
+ /* Decrease the multiplier in testing networks. This reduces the variance,
+ * so that bootstrap is more reliable. */
+ multiplier = 2; /* no more than triple the previous delay */
+ }
if (delay && delay < (INT_MAX-1) / multiplier) {
max_increment = delay * multiplier;