[or-cvs] r10815: Backport r10493: weight guard selection by bandwidth (in tor/branches/tor-0_1_2-patches: . doc src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-07-12 13:00:40 -0400 (Thu, 12 Jul 2007)
New Revision: 10815

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
 r13736@catbus:  nickm | 2007-07-12 12:54:33 -0400
 Backport r10493: weight guard selection by bandwidth



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13736] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:50:41 UTC (rev 10814)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 17:00:40 UTC (rev 10815)
@@ -30,6 +30,8 @@
       Resolves bug 444.
 
   o Minor bugfixes (misc)
+    - Weight guard selection by bandwidth, so that high-bandwidth nodes
+      don't get underused as guards.
     - On Windows, we were preventing other processes from reading
       cached-routers while Tor was running.  (Reported by janbar)
     - Fix a possible (but very unlikely) bug in picking routers by bandwidth.

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:50:41 UTC (rev 10814)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 17:00:40 UTC (rev 10815)
@@ -6,9 +6,9 @@
   o r10376, r10396: Fix segfaults in directory code
   o r10478: stop tearing down entire circuits because the user asked for
 	    a nonexistent hidden service port
-  - r10493: weight guard selection by bandwidth (??)
+  o r10493: weight guard selection by bandwidth
   o r10495: change an assert into a tor_assert
-  - r10521: fix an impossible (?) memory leak (??)
+  - r10521: fix an impossible^Wapparently real memory leak
   o r10524: make the LICENSE and AUTHORS files mention Tor.
   o r10563: use correct types with desc_digest_map.
   o r10566: build correctly on systems where size_t is bigger than ulong. 

Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-07-12 16:50:41 UTC (rev 10814)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-07-12 17:00:40 UTC (rev 10815)
@@ -1163,7 +1163,7 @@
     if (excludedsmartlist)
       smartlist_subtract(sl,excludedsmartlist);
 
-    if (need_capacity)
+    if (need_capacity || need_guard)
       choice = routerlist_sl_choose_by_bandwidth(sl, weight_for_exit);
     else
       choice = smartlist_choose(sl);