[or-cvs] r12113: Make authorities start accepting (and advertising their acce (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-22 20:23:33 -0400 (Mon, 22 Oct 2007)
New Revision: 12113

Modified:
   tor/trunk/
   tor/trunk/src/or/dirvote.c
Log:
 r16054 at 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.



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

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-10-23 00:23:32 UTC (rev 12112)
+++ tor/trunk/src/or/dirvote.c	2007-10-23 00:23:33 UTC (rev 12113)
@@ -116,7 +116,7 @@
     tor_snprintf(status, len,
                  "network-status-version 3\n"
                  "vote-status vote\n"
-                 "consensus-methods 1\n"
+                 "consensus-methods 1 2\n"
                  "published %s\n"
                  "valid-after %s\n"
                  "fresh-until %s\n"
@@ -421,7 +421,7 @@
 static int
 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