aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-01-29 15:17:05 -0500
committerNick Mathewson <nickm@torproject.org>2014-01-29 15:17:05 -0500
commit3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7 (patch)
tree72ce97eb89ecf28cced0f2098f1d23b4bc2f4283 /src/or/dirserv.h
parent4fe253ef40a96dbfb978752e9d2833e8b491ca28 (diff)
downloadtor-3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7.tar.gz
tor-3193cbe2bab9749f0e3cb48a31f6c1c8c61707a7.zip
Rip out all of the v2 directory code.
The remaining vestige is that we continue to publish the V2dir flag, and that, for the controller, we continue to emit v2 directory formats when requested.
Diffstat (limited to 'src/or/dirserv.h')
-rw-r--r--src/or/dirserv.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index c2d6131c7d..8591c4c186 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -56,7 +56,6 @@ void dirserv_compute_bridge_flag_thresholds(routerlist_t *rl);
int directory_fetches_from_authorities(const or_options_t *options);
int directory_fetches_dir_info_early(const or_options_t *options);
int directory_fetches_dir_info_later(const or_options_t *options);
-int directory_caches_v2_dir_info(const or_options_t *options);
int directory_caches_unknown_auth_certs(const or_options_t *options);
int directory_caches_dir_info(const or_options_t *options);
int directory_permits_begindir_requests(const or_options_t *options);
@@ -68,18 +67,12 @@ void directory_set_dirty(void);
cached_dir_t *dirserv_get_directory(void);
cached_dir_t *dirserv_get_runningrouters(void);
cached_dir_t *dirserv_get_consensus(const char *flavor_name);
-void dirserv_set_cached_networkstatus_v2(const char *directory,
- const char *identity,
- time_t published);
void dirserv_set_cached_consensus_networkstatus(const char *consensus,
const char *flavor_name,
const digests_t *digests,
time_t published);
void dirserv_clear_old_networkstatuses(time_t cutoff);
void dirserv_clear_old_v1_info(time_t now);
-void dirserv_get_networkstatus_v2(smartlist_t *result, const char *key);
-void dirserv_get_networkstatus_v2_fingerprints(smartlist_t *result,
- const char *key);
int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
const char **msg,
int for_unencrypted_conn,
@@ -136,7 +129,6 @@ STATIC int dirserv_query_measured_bw_cache_kb(const char *node_id,
long *bw_out,
time_t *as_of_out);
STATIC int dirserv_has_measured_bw(const char *node_id);
-STATIC cached_dir_t *generate_v2_networkstatus_opinion(void);
#endif
int dirserv_read_measured_bandwidths(const char *from_file,