diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2009-07-13 19:21:00 -0700 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@fscked.org> | 2009-08-06 14:47:04 -0700 |
| commit | b074e61ad35efdf146da14c0b967da3aa24c2cdc (patch) | |
| tree | 2f4af58033702cadb62b4c3b242309fab37a176b /src/or/dirvote.c | |
| parent | db297fb94485f7ffd5b244aeec7d200e5ba440b4 (diff) | |
| download | tor-b074e61ad35efdf146da14c0b967da3aa24c2cdc.tar.gz tor-b074e61ad35efdf146da14c0b967da3aa24c2cdc.zip | |
Throw the switch on consensus method 6.
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index acb658bd23..aadece9096 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -103,8 +103,10 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key, tor_snprintf(status, len, "network-status-version 3\n" "vote-status %s\n" - /* TODO-160: add 6 when ready */ - "consensus-methods 1 2 3 4 5\n" + /* XXX: If you change this value, you also need to + * change consensus_method_is_supported(). + * Perhaps we should unify these somehow? */ + "consensus-methods 1 2 3 4 5 6\n" "published %s\n" "valid-after %s\n" "fresh-until %s\n" @@ -456,7 +458,10 @@ compute_consensus_method(smartlist_t *votes) static int consensus_method_is_supported(int method) { - return (method >= 1) && (method <= 5); + /* XXX: If you change this value, you also need to change + * format_networkstatus_vote(). Perhaps we should unify + * these somehow? */ + return (method >= 1) && (method <= 6); } /** Helper: given <b>lst</b>, a list of version strings such that every |