[or-cvs] but only close the new conn if one of the earlier helper no...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
but only close the new conn if one of the earlier helper nodes
that we mark up is actually reachable, fast enough, etc to use.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -d -r1.195 -r1.196
--- circuitbuild.c	28 Dec 2005 07:20:33 -0000	1.195
+++ circuitbuild.c	28 Dec 2005 07:27:41 -0000	1.196
@@ -1959,11 +1959,14 @@ helper_node_set_status(const char *diges
             helper->made_contact = 1;
             SMARTLIST_FOREACH(helper_nodes, helper_node_t *, h,
               {
-                routerinfo_t *r = router_get_by_digest(h->identity);
+                routerinfo_t *r;
                 if (h->made_contact) {
                   h->down_since = 0;
-                  refuse_conn = 1;
-                  if (r) r->is_running = 1;
+                  r = helper_is_live(h, 0, 1);
+                  if (r) {
+                    refuse_conn = 1;
+                    r->is_running = 1;
+                  }
                 }
                 if (h == helper)
                   break;