Commit 901ee58c authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Enable conditional consensus downloading starting with 0.2.1.1-alpha servers 


svn:r14449
parent c65121b8

src/or/directory.c

+0 −4
Original line number Diff line number Diff line
@@ -789,10 +789,6 @@ directory_get_consensus_url(int supports_conditional_consensus) 
  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();

src/or/or.h

+0 −5
Original line number Diff line number Diff line
@@ -709,11 +709,6 @@ typedef enum { 
/** 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 {

src/or/routerparse.c

+1 −6
Original line number Diff line number Diff line
@@ -1836,13 +1836,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, 
        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]);