aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2009-10-26 19:27:54 -0700
committerKarsten Loesing <karsten.loesing@gmx.net>2009-10-26 19:27:54 -0700
commit4256a964618ea48a34d900b6c77fc6d7f97138cb (patch)
treedc6e2ca5f845e75ec8aa92ea816791142c8cb00a /src
parente0b2c84cde102b8202d47dccbde54245af03cb43 (diff)
downloadtor-4256a964618ea48a34d900b6c77fc6d7f97138cb.tar
tor-4256a964618ea48a34d900b6c77fc6d7f97138cb.tar.gz
Fix bug 1066.
If all authorities restart at once right before a consensus vote, nobody will vote about "Running", and clients will get a consensus with no usable relays. Instead, authorities refuse to build a consensus if this happens.
Diffstat (limited to 'src')
-rw-r--r--src/or/dirvote.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 5ce3fd2ca..65d7c477e 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2304,7 +2304,7 @@ static int
dirvote_compute_consensuses(void)
{
/* Have we got enough votes to try? */
- int n_votes, n_voters;
+ int n_votes, n_voters, n_vote_running = 0;
smartlist_t *votes = NULL, *votestrings = NULL;
char *consensus_body = NULL, *signatures = NULL, *votefile;
networkstatus_t *consensus = NULL;
@@ -2324,6 +2324,19 @@ dirvote_compute_consensuses(void)
"%d of %d", n_votes, n_voters/2);
goto err;
}
+ tor_assert(pending_vote_list);
+ SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, {
+ if (smartlist_string_isin(v->vote->known_flags, "Running"))
+ n_vote_running++;
+ });
+ if (!n_vote_running) {
+ /* See task 1066. */
+ log_warn(LD_DIR, "Nobody has voted on the Running flag. Generating "
+ "and publishing a consensus without Running nodes "
+ "would make many clients stop working. Not "
+ "generating a consensus!");
+ goto err;
+ }
if (!(my_cert = get_my_v3_authority_cert())) {
log_warn(LD_DIR, "Can't generate consensus without a certificate.");