aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2014-01-30 12:48:49 +0100
committerNick Mathewson <nickm@torproject.org>2014-02-03 13:34:30 -0500
commit00ec6e6af0775cd693e12e56eb6df3cbefe57daa (patch)
treef48f047c14bf4ca4e542255832f056e30e289042 /src/or/dirserv.c
parent881c7c0f7d86af501f7eeb34b021636af85d186f (diff)
downloadtor-00ec6e6af0775cd693e12e56eb6df3cbefe57daa.tar
tor-00ec6e6af0775cd693e12e56eb6df3cbefe57daa.tar.gz
More fixes to rip out all of the v2 directory code.
(This was a squash commit, but I forgot to squash it. Sorry! --Nick)
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 80a35c4e7..c0e000c75 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -56,9 +56,6 @@ static time_t the_directory_is_dirty = 1;
/** Do we need to regenerate the v1 runningrouters document when somebody
* asks for it? */
static time_t runningrouters_is_dirty = 1;
-/** Do we need to regenerate our v2 networkstatus document when somebody asks
- * for it? */
-static time_t the_v2_networkstatus_is_dirty = 1;
/** Most recently generated encoded signed v1 directory. (v1 auth dirservers
* only.) */
@@ -929,8 +926,6 @@ directory_set_dirty(void)
if (!runningrouters_is_dirty)
runningrouters_is_dirty = now;
}
- if (!the_v2_networkstatus_is_dirty)
- the_v2_networkstatus_is_dirty = now;
}
/**
@@ -1477,7 +1472,7 @@ dirserv_clear_old_v1_info(time_t now)
}
}
-/** Helper: If we're an authority for the right directory version (v1 or v2)
+/** Helper: If we're an authority for the right directory version (v1)
* (based on <b>auth_type</b>), try to regenerate
* auth_src as appropriate and return it, falling back to cache_src on
* failure. If we're a cache, simply return cache_src.