From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 May 2011 15:14:28 +0000 (-0400)
Subject: Rip out more of hid_serv_acting_as_directory
X-Git-Tag: tor-0.2.2.26-beta~11^2~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b512fb9146a4354067491d9d7de92f594a83390;p=thirdparty%2Ftor.git

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.
---

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;
 }