diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirserv.c | 12 | ||||
| -rw-r--r-- | src/or/dirvote.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7c702fa2dd..cf941f6c24 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1969,18 +1969,18 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, char tbuf[ISO_TIME_LEN+1]; networkstatus_vote_t *current_consensus = networkstatus_get_live_consensus(now); - time_t consensus_interval; + time_t last_consensus_interval; /* only used to pick a valid_after */ if (current_consensus) - consensus_interval = current_consensus->fresh_until - + last_consensus_interval = current_consensus->fresh_until - current_consensus->valid_after; else - consensus_interval = timing.vote_interval; + last_consensus_interval = DEFAULT_VOTING_INTERVAL_WHEN_NO_CONSENSUS; v3_out->valid_after = - dirvote_get_start_of_next_interval(now, consensus_interval); + dirvote_get_start_of_next_interval(now, last_consensus_interval); format_iso_time(tbuf, v3_out->valid_after); log_notice(LD_DIR,"Choosing valid-after time in vote as %s: " - "consensus_set=%d, interval=%d", - tbuf, current_consensus?1:0, (int)consensus_interval); + "consensus_set=%d, last_interval=%d", + tbuf, current_consensus?1:0, (int)last_consensus_interval); } v3_out->fresh_until = v3_out->valid_after + timing.vote_interval; v3_out->valid_until = v3_out->valid_after + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 32943319a3..10882119fe 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1217,7 +1217,7 @@ dirvote_recalculate_timing(or_options_t *options, time_t now) vote_delay = consensus->vote_seconds; dist_delay = consensus->dist_seconds; } else { - interval = 30*60; + interval = DEFAULT_VOTING_INTERVAL_WHEN_NO_CONSENSUS; vote_delay = dist_delay = 300; } diff --git a/src/or/or.h b/src/or/or.h index d50e78c1ae..5ce2039760 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2907,6 +2907,9 @@ cached_dir_t *new_cached_dir(char *s, time_t published); /** Smallest allowable voting interval. */ #define MIN_VOTE_INTERVAL 300 +/** If there is no consensus, what interval do we default to? */ +#define DEFAULT_VOTING_INTERVAL_WHEN_NO_CONSENSUS (30*60) + void dirvote_free_all(void); /* vote manipulation */ |