From: Roger Dingledine <arma@torproject.org>
Date: Fri, 16 Nov 2007 05:29:27 +0000 (+0000)
Subject: Karsten: you should look at this and decide if we should skip over
X-Git-Tag: tor-0.2.0.12-alpha~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60ee26c87379b9c7989672d111421d384c953c59;p=thirdparty%2Ftor.git

Karsten: you should look at this and decide if we should skip over
non-running hsdirs, or not give them the flag if they're not running,
or what.

When picking v2 hidden service directories, don't pick ones that
aren't listed as Running.


svn:r12509
---

diff --git a/ChangeLog b/ChangeLog
index c1e1b67ac5..b562ee2c9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Changes in version 0.2.0.12-alpha - 2007-11-??
       newly picked entry guard. Reported by Mike Perry.
     - Changing the ExitPolicyRejectPrivate setting should cause us to
       rebuild the descriptor.
+    - When picking v2 hidden service directories, don't pick ones that
+      aren't listed as Running.
 
   o Minor features:
     - When we negotiate a v2 OR connection (not yet implemented), accept
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index d9b84dbd8d..0854e01ab7 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4480,7 +4480,7 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs,
   i = start;
   do {
     routerstatus_t *r = smartlist_get(c->routerstatus_list, i);
-    if (r->is_hs_dir) {
+    if (r->is_hs_dir && r->is_running) {
       smartlist_add(responsible_dirs, r);
       if (++n_added == REND_NUMBER_OF_CONSECUTIVE_REPLICAS)
         return 0;