[or-cvs] r10403: Oops. Authorities should recommend nodes as exits. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-29 17:05:49 -0400 (Tue, 29 May 2007)
New Revision: 10403

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r13079 at catbus:  nickm | 2007-05-29 17:05:38 -0400
 Oops. Authorities should recommend nodes as exits.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13079] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-05-29 20:52:56 UTC (rev 10402)
+++ tor/trunk/src/or/dirserv.c	2007-05-29 21:05:49 UTC (rev 10403)
@@ -1845,8 +1845,7 @@
 
   SMARTLIST_FOREACH(routers, routerinfo_t *, ri, {
     if (ri->cache_info.published_on >= cutoff) {
-      /* Already set by compute_performance_thresholds. */
-      int f_exit = ri->is_exit;
+
       routerstatus_t rs;
       /* These versions dump connections with idle live circuits
          sometimes. D'oh!*/
@@ -1855,6 +1854,9 @@
         !tor_version_as_new_as(ri->platform,"0.1.1.16-rc-cvs");
       memset(&rs, 0, sizeof(rs));
 
+
+      /* Already set by compute_performance_thresholds. */
+      rs.is_exit = ri->is_exit;
       rs.is_stable = ri->is_stable =
         router_is_active(ri, now) &&
         !dirserv_thinks_router_is_unreliable(now, ri, 1, 0) &&
@@ -1870,7 +1872,7 @@
       rs.is_named = naming && ri->is_named;
       rs.is_valid = ri->is_valid;
       rs.is_possible_guard = rs.is_fast && rs.is_stable &&
-        (!f_exit || exits_can_be_guards) &&
+        (!rs.is_exit || exits_can_be_guards) &&
         router_get_advertised_bandwidth(ri) >=
           (exits_can_be_guards ? guard_bandwidth_including_exits :
                                  guard_bandwidth_excluding_exits);