[or-cvs] r9441: If the user asks to use invalid exit nodes, be willing to us (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-01-27 14:40:49 -0500 (Sat, 27 Jan 2007)
New Revision: 9441

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuitbuild.c
Log:
If the user asks to use invalid exit nodes, be willing to use the
unstable ones.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-01-27 19:29:16 UTC (rev 9440)
+++ tor/trunk/ChangeLog	2007-01-27 19:40:49 UTC (rev 9441)
@@ -57,6 +57,8 @@
       instead, only add it the OR connection that will eventually receive it
       has some room for it.  (This can lead to slowdowns in tunneled dir
       connectinos; a better solution will have to wait for 0.2.0.)
+    - If the user asks to use invalid exit nodes, be willing to use the
+      unstable ones.
 
   o Major features:
     - Weight directory requests by advertised bandwidth. Now we can

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2007-01-27 19:29:16 UTC (rev 9440)
+++ tor/trunk/src/or/circuitbuild.c	2007-01-27 19:40:49 UTC (rev 9441)
@@ -1187,10 +1187,8 @@
       n_supported[i] = -1;
       continue; /* skip routers that are not suitable */
     }
-    if (!router->is_valid &&
-        (!(options->_AllowInvalid & ALLOW_INVALID_EXIT) ||
-         router_is_unreliable(router, 1, 1, 0))) {
-      /* if it's invalid, and either we don't want it or it's unsuitable */
+    if (!(router->is_valid || options->_AllowInvalid & ALLOW_INVALID_EXIT)) {
+      /* if it's invalid and we don't want it */
       n_supported[i] = -1;
 //      log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- invalid router.",
 //             router->nickname, i);