r15581@catbus: nickm | 2007-10-09 14:36:47 -0400

 Recompute voting schedule whenever a consensus is set.

svn:r11808

diff --git a/ChangeLog b/ChangeLog
index e405ac58052d27fc3b6bd20e9d404b7872e7783e..64421b9d9b1a06e6cbd16e7f2c99c82f748cc5c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ Changes in version 0.2.0.8-alpha - 2007-??-??
     - Only change the reply to a vote to "OK" if it's not already set.  This
       gets rid of annoying "400 OK" log messages, which may have been masking
       some deeper issue.  Bugfix on 0.2.0.7-alpha.
+    - When we get a valid consensus, recompute the voting schedule.
 
   o Minor bugfixes (performance):
     - Use a slightly simpler string hashing algorithm (copying Python's

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 1e19f65534589720b1260aa6fa769763f99a94ec..c6472a1a89f7c4b4572565644c65bff88e8c43a4 100644 (file)
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1080,8 +1080,6 @@ static struct {
 void
 dirvote_recalculate_timing(time_t now)
 {
-  /* XXXX020 call this when inputs may have changed (i.e., whenver we get a
-   * fresh consensus.) */
   int interval, vote_delay, dist_delay;
   time_t start;
   time_t end;
@@ -1361,6 +1359,7 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
  again:
   vote = networkstatus_parse_vote_from_string(vote_body, &end_of_vote, 1);
   if (!vote) {
+    log_warn(LD_DIR, "Couldn't parse vote: length was %d", strlen(vote_body));
     *msg_out = "Unable to parse vote";
     goto err;
   }

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index b747d27979170b3600c80ee4736536c2c640eaec..b65d434468ff50babd886c1a0cb3a281e1dc4c00 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1015,6 +1015,7 @@ networkstatus_set_current_consensus(const char *consensus, int from_cache,
   current_consensus = c;
 
   update_consensus_networkstatus_fetch_time(now);
+  dirvote_recalculate_timing(now);
 
   if (!from_cache) {
     or_options_t *options = get_options();