torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r14011@Kushana: nickm | 2007-08-14 10:29:49 -0400

Browse Source 
Actually upload signatures when we vote. log more about the signatures we get.  discard pending vote stuff after we publish.


svn:r11104
This commit is contained in:
Nick Mathewson
2007-08-14 14:30:45 +00:00
parent 944bc41f99
commit 925394022a
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/dirvote.c
+20 -2
View File
@@ -1081,7 +1081,7 @@ dirvote_recalculate_timing(time_t now)
voting_schedule.voting_ends = start - vote_delay;
voting_schedule.voting_starts = start - vote_delay - dist_delay;
voting_schedule.discard_old_votes = start + 600; /* XXXX020 */
voting_schedule.discard_old_votes = start + 300; /* XXXX020 */
}
/** DOCDOC */
@@ -1180,6 +1180,13 @@ dirvote_clear_pending_votes(void)
tor_free(cp));
smartlist_clear(pending_consensus_signature_list);
}
tor_free(pending_consensus_body);
tor_free(pending_consensus_signatures);
if (pending_consensus) {
networkstatus_vote_free(pending_consensus);
pending_consensus = NULL;
}
log_notice(LD_DIR, "Pending votes cleared.");
}
@@ -1349,7 +1356,15 @@ dirvote_compute_consensus(void)
smartlist_clear(pending_consensus_signature_list);
}
log_notice(LD_DIR, "Consensus computed.");
log_notice(LD_DIR, "Consensus computed; uploading signature(s)");
directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_SIGNATURES,
ROUTER_PURPOSE_GENERAL,
V3_AUTHORITY,
pending_consensus_signatures,
strlen(pending_consensus_signatures), 0);
log_notice(LD_DIR, "Signature(s) posted.");
return 0;
err:
if (votes)
@@ -1424,9 +1439,11 @@ dirvote_add_signatures(const char *detached_signatures_body)
{
if (pending_consensus) {
const char *msg=NULL;
log_notice(LD_DIR, "Got a signature. Adding it to the pending consensus.");
return dirvote_add_signatures_to_pending_consensus(
detached_signatures_body, &msg);
} else {
log_notice(LD_DIR, "Got a signature. Queueing it for the next consensus.");
if (!pending_consensus_signature_list)
pending_consensus_signature_list = smartlist_create();
smartlist_add(pending_consensus_signature_list,
@@ -1450,6 +1467,7 @@ dirvote_publish_consensus(void)
log_warn(LD_DIR, "Error publishing consensus");
else
log_warn(LD_DIR, "Consensus published.");
return 0;
}