diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-04-24 15:39:08 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-04-24 15:39:08 +0000 |
| commit | 901ee58c5348924d7eb06abd090f80441d5e262d (patch) | |
| tree | 864e3c02d1df168e4764ca6aa18f7d78776ff977 | |
| parent | c65121b81fe98e0dab7329730b6e7c98f66f19fe (diff) | |
| download | tor-901ee58c5348924d7eb06abd090f80441d5e262d.tar.gz tor-901ee58c5348924d7eb06abd090f80441d5e262d.zip | |
Enable conditional consensus downloading starting with 0.2.1.1-alpha servers
svn:r14449
| -rw-r--r-- | src/or/directory.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 5 | ||||
| -rw-r--r-- | src/or/routerparse.c | 7 |
3 files changed, 1 insertions, 15 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 4688170fc4..135ba54da2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -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(); diff --git a/src/or/or.h b/src/or/or.h index 4dffef89f7..592cef764a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -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 { diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2ea9487d03..016b938ae9 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -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]); |