r16054@catbus: nickm | 2007-10-22 20:22:13 -0400

Make authorities start accepting (and advertising their acceptance of) consensus method 2.  If all goes well, we'll have a working Unnamed flag.  Otherwise, we'll have a fun backtrace.


svn:r12113
This commit is contained in:
Nick Mathewson 2007-10-23 00:23:33 +00:00
parent eba143611b
commit 6f7518c501

View File

@ -116,7 +116,7 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
tor_snprintf(status, len, tor_snprintf(status, len,
"network-status-version 3\n" "network-status-version 3\n"
"vote-status vote\n" "vote-status vote\n"
"consensus-methods 1\n" "consensus-methods 1 2\n"
"published %s\n" "published %s\n"
"valid-after %s\n" "valid-after %s\n"
"fresh-until %s\n" "fresh-until %s\n"
@ -421,7 +421,7 @@ compute_consensus_method(smartlist_t *votes)
static int static int
consensus_method_is_supported(int method) consensus_method_is_supported(int method)
{ {
return (method == 1); return (method >= 1) && (method <= 2);
} }
/** Given a list of vote networkstatus_vote_t in <b>votes</b>, our public /** Given a list of vote networkstatus_vote_t in <b>votes</b>, our public