[or-cvs] r14449: Enable conditional consensus downloading starting with 0.2.1 (tor/trunk/src/or)

[weasel at seul.org]

Author: weasel
Date: 2008-04-24 11:39:08 -0400 (Thu, 24 Apr 2008)
New Revision: 14449

Modified:
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/routerparse.c
Log:
Enable conditional consensus downloading starting with 0.2.1.1-alpha servers


Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2008-04-24 15:39:03 UTC (rev 14448)
+++ tor/trunk/src/or/directory.c	2008-04-24 15:39:08 UTC (rev 14449)
@@ -789,10 +789,6 @@
   char *url;
   int len;
 
-#ifndef SUPPORTS_CONDITIONAL_CONSENSUS_SINCE_VERSION
-  supports_conditional_consensus = 0;
-#endif
-
   if (supports_conditional_consensus) {
     char *authority_id_list;
     smartlist_t *authority_digets = smartlist_create();

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-04-24 15:39:03 UTC (rev 14448)
+++ tor/trunk/src/or/or.h	2008-04-24 15:39:08 UTC (rev 14449)
@@ -709,11 +709,6 @@
 /** Largest number of bytes that can fit in a relay cell payload. */
 #define RELAY_PAYLOAD_SIZE (CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE)
 
-/** Version that started supporting conditional consensus downloading
- *  as a dirserver.  This define can go once we know the answer and
- *  want to use the feature. */
-// #define SUPPORTS_CONDITIONAL_CONSENSUS_SINCE_VERSION "0.2.1.1"
-
 /** Parsed onion routing cell.  All communication between nodes
  * is via cells. */
 typedef struct cell_t {

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2008-04-24 15:39:03 UTC (rev 14448)
+++ tor/trunk/src/or/routerparse.c	2008-04-24 15:39:08 UTC (rev 14449)
@@ -1836,13 +1836,8 @@
         tor_version_as_new_as(tok->args[0], "0.2.0.0-alpha-dev (r10070)");
       rs->version_supports_v3_dir =
         tor_version_as_new_as(tok->args[0], "0.2.0.8-alpha");
-#ifdef SUPPORTS_CONDITIONAL_CONSENSUS_SINCE_VERSION
       rs->version_supports_conditional_consensus =
-        tor_version_as_new_as(tok->args[0],
-                              SUPPORTS_CONDITIONAL_CONSENSUS_SINCE_VERSION);
-#else
-      rs->version_supports_conditional_consensus = 0;
-#endif
+        tor_version_as_new_as(tok->args[0], "0.2.1.1-alpha");
     }
     if (vote_rs) {
       vote_rs->version = tor_strdup(tok->args[0]);