[or-cvs] r12509: Karsten: you should look at this and decide if we should ski (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-16 00:29:27 -0500 (Fri, 16 Nov 2007)
New Revision: 12509

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
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.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-15 22:08:12 UTC (rev 12508)
+++ tor/trunk/ChangeLog	2007-11-16 05:29:27 UTC (rev 12509)
@@ -10,6 +10,8 @@
       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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-11-15 22:08:12 UTC (rev 12508)
+++ tor/trunk/src/or/routerlist.c	2007-11-16 05:29:27 UTC (rev 12509)
@@ -4480,7 +4480,7 @@
   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;