Просмотр исходного кода

If the user asks to use invalid exit nodes, be willing to use the
unstable ones.


svn:r9441

Roger Dingledine 19 лет назад
Родитель
Сommit
d8d074f2e5
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 0
      ChangeLog
  2. 2 4
      src/or/circuitbuild.c

+ 2 - 0
ChangeLog

@@ -57,6 +57,8 @@ Changes in version 0.1.2.7-alpha - 2007-??-??
       instead, only add it the OR connection that will eventually receive it
       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
       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.)
       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:
   o Major features:
     - Weight directory requests by advertised bandwidth. Now we can
     - Weight directory requests by advertised bandwidth. Now we can

+ 2 - 4
src/or/circuitbuild.c

@@ -1187,10 +1187,8 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
       n_supported[i] = -1;
       n_supported[i] = -1;
       continue; /* skip routers that are not suitable */
       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;
       n_supported[i] = -1;
 //      log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- invalid router.",
 //      log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- invalid router.",
 //             router->nickname, i);
 //             router->nickname, i);