diff options
| author | Matt Traudt <sirmatt@ksu.edu> | 2016-09-06 12:09:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-26 16:33:54 -0400 |
| commit | 909ee0e55fa7f03b8b85bc220ba11d91cb495d06 (patch) | |
| tree | 0b67050f5ef1fc7159612ee1e2b154db235c02cf /src/or | |
| parent | 39375db3dc668f11925a82e6d4cef2beed91d47b (diff) | |
| download | tor-909ee0e55fa7f03b8b85bc220ba11d91cb495d06.tar.gz tor-909ee0e55fa7f03b8b85bc220ba11d91cb495d06.zip | |
Fix default bw weights with new consensus method
See #14881
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirvote.c | 5 | ||||
| -rw-r--r-- | src/or/dirvote.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index fe664698bc..4a955e35de 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1367,6 +1367,11 @@ networkstatus_compute_consensus(smartlist_t *votes, consensus_method = MAX_SUPPORTED_CONSENSUS_METHOD; } + if (consensus_method >= MIN_METHOD_FOR_INIT_BW_WEIGHTS_ONE) { + G = M = E = D = 1; + T = 4; + } + /* Compute medians of time-related things, and figure out how many * routers we might need to talk about. */ { diff --git a/src/or/dirvote.h b/src/or/dirvote.h index efd233ef5f..334734654a 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -55,7 +55,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 25 +#define MAX_SUPPORTED_CONSENSUS_METHOD 26 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -111,6 +111,10 @@ * entries. */ #define MIN_METHOD_FOR_RS_PROTOCOLS 25 +/** Lowest consensus method where authorities initialize bandwidth weights to 1 + * instead of 0. See #14881 */ +#define MIN_METHOD_FOR_INIT_BW_WEIGHTS_ONE 26 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */ |