[or-cvs] [tor/maint-0.2.2 1/2] Kill warn when picking bridges without bw weight

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Sun, 5 Sep 2010 07:43:03 +0200
Subject: Kill warn when picking bridges without bw weight
Commit: 303beead53c24cfc2b48a0873950f46beb6d8e58

Bridges and other relays not included in the consensus don't
necessarily have a non-zero bandwidth capacity. If all our
configured bridges had a zero bw capacity we would warn the
user. Change that.
---
 changes/bug1805     |    4 ++++
 src/or/routerlist.c |   10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 changes/bug1805

diff --git a/changes/bug1805 b/changes/bug1805
new file mode 100644
index 0000000..fdd03fb
--- /dev/null
+++ b/changes/bug1805
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Make sure we don't warn about not having bandwidth weights when
+      choosing bridges or other relays not in the consensus. Bugfix
+      on 0.2.2.10-alpha; fixes bug 1805.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 8808f56..a153bc1 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1586,6 +1586,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
   double *bandwidths;
   double tmp = 0;
   unsigned int i;
+  int have_unknown = 0; /**< sl contains element not in consensus. */
 
   /* Can't choose exit and guard at same time */
   tor_assert(rule == NO_WEIGHTING ||
@@ -1702,6 +1703,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
         this_bw = kb_to_bytes(rs->bandwidth);
       } else { /* bridge or other descriptor not in our consensus */
         this_bw = router_get_advertised_bandwidth_capped(router);
+        have_unknown = 1;
       }
       if (router_digest_is_me(router->cache_info.identity_digest))
         is_me = 1;
@@ -1732,9 +1734,11 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl,
 
   /* If there is no bandwidth, choose at random */
   if (DBL_TO_U64(weighted_bw) == 0) {
-    log_warn(LD_CIRC,
-             "Weighted bandwidth is %lf in node selection for rule %s",
-             weighted_bw, bandwidth_weight_rule_to_string(rule));
+    /* Dont't warn when using bridges/relays not in the consensus */
+    if (!have_unknown)
+      log_warn(LD_CIRC,
+               "Weighted bandwidth is %lf in node selection for rule %s",
+               weighted_bw, bandwidth_weight_rule_to_string(rule));
     tor_free(bandwidths);
     return smartlist_choose(sl);
   }
-- 
1.7.1