[tor-commits] [tor/maint-0.2.2] Revert "If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port."

[nickm at torproject.org]

commit a6cc15e2aedfc370fc0328edd375a869338ee4f1
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Sat Mar 12 07:17:26 2011 -0800

    Revert "If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port."
    
    This reverts commit 9a7098487b2c25f36112b3521758f42621dcd6af.
    
    Conflicts:
    
    	ChangeLog (left unchanged by this commit)
---
 src/or/routerlist.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index fb8fb88..5e9c82a 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5335,7 +5335,6 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs,
 {
   int start, found, n_added = 0, i;
   networkstatus_t *c = networkstatus_get_latest_consensus();
-  int use_begindir = get_options()->TunnelDirConns;
   if (!c || !smartlist_len(c->routerstatus_list)) {
     log_warn(LD_REND, "We don't have a consensus, so we can't perform v2 "
              "rendezvous operations.");
@@ -5348,14 +5347,9 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs,
   do {
     routerstatus_t *r = smartlist_get(c->routerstatus_list, i);
     if (r->is_hs_dir) {
-      if (r->dir_port || use_begindir)
-        smartlist_add(responsible_dirs, r);
-      else
-        log_info(LD_REND, "Not adding router '%s' to list of responsible "
-                 "hidden service directories, because we have no way of "
-                 "reaching it.", r->nickname);
+      smartlist_add(responsible_dirs, r);
       if (++n_added == REND_NUMBER_OF_CONSECUTIVE_REPLICAS)
-        break;
+        return 0;
     }
     if (++i == smartlist_len(c->routerstatus_list))
       i = 0;