[or-cvs] r11558: Oops; we had vote_delay and dist_delay switched when computi (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-09-21 15:11:52 -0400 (Fri, 21 Sep 2007)
New Revision: 11558

Modified:
   tor/trunk/
   tor/trunk/src/or/dirvote.c
Log:
 r15253 at catbus:  nickm | 2007-09-21 15:03:51 -0400
 Oops; we had vote_delay and dist_delay switched when computing when to generate our consensus.  Harmless so far, but let's get that fixed.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15253] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-09-21 17:23:14 UTC (rev 11557)
+++ tor/trunk/src/or/dirvote.c	2007-09-21 19:11:52 UTC (rev 11558)
@@ -1062,8 +1062,12 @@
 static struct {
   /** When do we generate and distribute our vote for this interval? */
   time_t voting_starts;
+  /** DOCDOC */
+  time_t fetch_missing_votes;
   /** When do we give up on getting more votes and generate a consensus? */
   time_t voting_ends;
+  /** DOCDOC */
+  time_t fetch_missing_signatures;
   /** When do we publish the consensus? */
   time_t interval_starts;
 
@@ -1076,7 +1080,7 @@
   int have_built_consensus;
   /* True iff we have published our consensus. */
   int have_published_consensus;
-} voting_schedule = {0,0,0,0,0,0,0};
+} voting_schedule = {0,0,0,0,0,0,0,0,0};
 
 /** Set voting_schedule to hold the timing for the next vote we should be
  * doing. */
@@ -1112,8 +1116,10 @@
 
   tor_assert(end > start);
 
-  voting_schedule.voting_ends = start - vote_delay;
-  voting_schedule.voting_starts = start - vote_delay - dist_delay;
+  voting_schedule.fetch_missing_signatures = start - (dist_delay/2);
+  voting_schedule.voting_ends = start - dist_delay;
+  voting_schedule.fetch_missing_votes = start - dist_delay - (vote_delay/2);
+  voting_schedule.voting_starts = start - dist_delay - vote_delay;
 
   voting_schedule.discard_old_votes = start +
     ((end-start) - vote_delay - dist_delay)/2 ;