tor

commit fcaa4ab82463a0a27a0605d5aa01ed7d01e3387a
parent 14b0bba06e65a1dfca6a2f15f3016cb36409183f
Author: teor <teor2345@gmail.com>
Date:   Wed,  8 Nov 2017 14:17:03 +1100

Actually log the total bandwidth in compute_weighted_bandwidths()

Fixes bug 24170; bugfix on 0.2.4.3-alpha.

Diffstat:
A
changes/bug24170
 | 
3
+++
M
src/or/routerlist.c
 | 
5
++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changes/bug24170 b/changes/bug24170
@@ -0,0 +1,3 @@
+  o Minor bugfixes (path selection):
+    - Actually log the total bandwidth in compute_weighted_bandwidths().
+      Fixes bug 24170; bugfix on 0.2.4.3-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
@@ -2546,7 +2546,6 @@ compute_weighted_bandwidths(const smartlist_t *sl,
   int64_t weight_scale;
   double Wg = -1, Wm = -1, We = -1, Wd = -1;
   double Wgb = -1, Wmb = -1, Web = -1, Wdb = -1;
-  uint64_t weighted_bw = 0;
   guardfraction_bandwidth_t guardfraction_bw;
   double *bandwidths;
   double total_bandwidth = 0.0;
@@ -2728,9 +2727,9 @@ compute_weighted_bandwidths(const smartlist_t *sl,
 
   log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "
             "on weights "
-            "Wg=%f Wm=%f We=%f Wd=%f with total bw "U64_FORMAT,
+            "Wg=%f Wm=%f We=%f Wd=%f with total bw %f",
             bandwidth_weight_rule_to_string(rule),
-            Wg, Wm, We, Wd, U64_PRINTF_ARG(weighted_bw));
+            Wg, Wm, We, Wd, total_bandwidth);
 
   *bandwidths_out = bandwidths;