summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-04-24 15:38:57 +0000
committerPeter Palfrader <peter@palfrader.org>2008-04-24 15:38:57 +0000
commit788404dacff64c0a2d120b317ab5d4c8a2b8f811 (patch)
treed7fbcac52105dc1f9fd9ebec14a69acb8b5dd516 /src/or/routerparse.c
parent006b5762d3635c1d0650704f4a55d0860776ee18 (diff)
downloadtor-788404dacff64c0a2d120b317ab5d4c8a2b8f811.tar.gz
tor-788404dacff64c0a2d120b317ab5d4c8a2b8f811.zip
and the client part of the consensus-by-authority-fpr proposal (ifdef'ed out)
svn:r14446
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 7ff6c63112..2ea9487d03 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1828,6 +1828,7 @@ routerstatus_parse_entry_from_string(memarea_t *area,
if (strcmpstart(tok->args[0], "Tor ")) {
rs->version_supports_begindir = 1;
rs->version_supports_extrainfo_upload = 1;
+ rs->version_supports_conditional_consensus = 1;
} else {
rs->version_supports_begindir =
tor_version_as_new_as(tok->args[0], "0.2.0.1-alpha");
@@ -1835,6 +1836,13 @@ 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
}
if (vote_rs) {
vote_rs->version = tor_strdup(tok->args[0]);