[or-cvs] r11273: formatting cleanups (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-08-25 17:31:34 -0400 (Sat, 25 Aug 2007)
New Revision: 11273

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
   tor/trunk/src/or/routerlist.c
Log:
formatting cleanups


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-25 20:34:13 UTC (rev 11272)
+++ tor/trunk/ChangeLog	2007-08-25 21:31:34 UTC (rev 11273)
@@ -4,6 +4,8 @@
       mean-times-between-failures. When we have 4 or more days of data,
       use measured MTBF rather than declared uptime to decide whether
       to call a router Stable. Implements proposal 108.
+
+  o Major bugfixes (load balancing):
     - When choosing nodes for non-guard positions, weight guards
       proportionally less, since they already have enough load. Patch
       from Mike Perry.

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-08-25 20:34:13 UTC (rev 11272)
+++ tor/trunk/src/or/config.c	2007-08-25 21:31:34 UTC (rev 11273)
@@ -4359,9 +4359,9 @@
                "file. Proceeding anyway.", state->TorVersion);
     } else { /* take action based on v */
       if ((tor_version_as_new_as(state->TorVersion, "0.1.1.10-alpha") &&
-          !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev"))
-          || (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") &&
-          !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) {
+           !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev")) ||
+          (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") &&
+           !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) {
         log_notice(LD_CONFIG, "Detected state file from old version '%s'. "
                    "Choosing new entry guards for you.",
                    state->TorVersion);

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-08-25 20:34:13 UTC (rev 11272)
+++ tor/trunk/src/or/routerlist.c	2007-08-25 21:31:34 UTC (rev 11273)
@@ -1320,7 +1320,7 @@
   /* First count the total bandwidth weight, and make a list
    * of each value.  <0 means "unknown; no routerinfo."  We use the
    * bits of negative values to remember whether the router was fast (-x)&1
-   * and whether it was an exit (-x)&2.  Yes, it's a hack. */
+   * and whether it was an exit (-x)&2 or guard (-x)&4.  Yes, it's a hack. */
   bandwidths = tor_malloc(sizeof(int32_t)*smartlist_len(sl));
   exit_bits = bitarray_init_zero(smartlist_len(sl));
   guard_bits = bitarray_init_zero(smartlist_len(sl));