aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirvote.c
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@fscked.org>2013-03-26 14:15:58 -0700
committerNick Mathewson <nickm@torproject.org>2013-03-29 12:20:54 -0400
commit651e49713c38b8ec2bde285001e46b61c500d10c (patch)
tree97132b2f326cd525f6bda4874df22a4d570a3ad1 /src/or/dirvote.c
parentf6a2f088fdd3b3ed3ccc355c98dde8da37b70a09 (diff)
downloadtor-651e49713c38b8ec2bde285001e46b61c500d10c.tar
tor-651e49713c38b8ec2bde285001e46b61c500d10c.tar.gz
Bug 8419: Apply the badexit fix from #2203 to validatio too
This was causing dirauths to emit flag weight validation warns if there was a sufficiently large amount of badexit bandwidth to make a difference in flag weight results.
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r--src/or/dirvote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index bcfe2b069..7043cef24 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1913,7 +1913,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
}
/* Fix bug 2203: Do not count BadExit nodes as Exits for bw weights */
- if (consensus_method >= 11) {
+ if (consensus_method >= MIN_METHOD_TO_CUT_BADEXIT_WEIGHT) {
is_exit = is_exit && !is_bad_exit;
}
@@ -2210,7 +2210,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
}
// Verify balancing parameters
if (consensus_method >= MIN_METHOD_FOR_BW_WEIGHTS && added_weights) {
- networkstatus_verify_bw_weights(c);
+ networkstatus_verify_bw_weights(c, consensus_method);
}
networkstatus_vote_free(c);
}