[tor-commits] [tor/release-0.2.2] Rip out more of hid_serv_acting_as_directory

[nickm at torproject.org]

commit 1b512fb9146a4354067491d9d7de92f594a83390
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 11:14:28 2011 -0400

    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.
---
 src/or/routerlist.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 354e026..22cf87e 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;
 }