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 c1e1b67ac577e58e289de4f57eb0f2c1eff04dec..b562ee2c9aabde4bd4d588e55ecb28a6ce51a8dd 100644 (file)
--- 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 d9b84dbd8d2fb3ac9cbe4277fd0189b57b045c86..0854e01ab7569b85c352880284fb00145c3624c8 100644 (file)
--- 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;