summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 11:14:28 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 11:17:44 -0400
commit1b512fb9146a4354067491d9d7de92f594a83390 (patch)
treeb24dd33836bd6b2ab1a84df11b69b355d4fcc839
parent7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8 (diff)
downloadtor-1b512fb9146a4354067491d9d7de92f594a83390.tar.gz
tor-1b512fb9146a4354067491d9d7de92f594a83390.zip
Rip out more of hid_serv_acting_as_directory
rransom notes correctly that now that we aren't checking our HSDir flag, we have no actual reason to check whether we are listed in the consensus at all when determining if we should act like a hidden service directory.
-rw-r--r--src/or/routerlist.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 354e026306..22cf87e801 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5758,8 +5758,6 @@ int
hid_serv_acting_as_directory(void)
{
routerinfo_t *me = router_get_my_routerinfo();
- networkstatus_t *c;
- routerstatus_t *rs;
if (!me)
return 0;
if (!get_options()->HidServDirectoryV2) {
@@ -5767,17 +5765,6 @@ hid_serv_acting_as_directory(void)
"because we have not been configured as such.");
return 0;
}
- if (!(c = networkstatus_get_latest_consensus())) {
- log_info(LD_REND, "There's no consensus, so I can't tell if I'm a hidden "
- "service directory");
- return 0;
- }
- rs = networkstatus_vote_find_entry(c, me->cache_info.identity_digest);
- if (!rs) {
- log_info(LD_REND, "We're not listed in the consensus, so we're not "
- "being a hidden service directory.");
- return 0;
- }
return 1;
}