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.
This commit is contained in:
Nick Mathewson 2011-05-15 11:14:28 -04:00
parent 7779c63e93
commit 1b512fb914

View File

@ -5758,8 +5758,6 @@ int
hid_serv_acting_as_directory(void) hid_serv_acting_as_directory(void)
{ {
routerinfo_t *me = router_get_my_routerinfo(); routerinfo_t *me = router_get_my_routerinfo();
networkstatus_t *c;
routerstatus_t *rs;
if (!me) if (!me)
return 0; return 0;
if (!get_options()->HidServDirectoryV2) { if (!get_options()->HidServDirectoryV2) {
@ -5767,17 +5765,6 @@ hid_serv_acting_as_directory(void)
"because we have not been configured as such."); "because we have not been configured as such.");
return 0; 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; return 1;
} }