]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Actually log the total bandwidth in compute_weighted_bandwidths()
authorteor <teor2345@gmail.com>
Wed, 8 Nov 2017 03:17:03 +0000 (14:17 +1100)
committerNick Mathewson <nickm@torproject.org>
Wed, 8 Nov 2017 15:45:18 +0000 (10:45 -0500)
Fixes bug 24170; bugfix on 0.2.4.3-alpha.

changes/bug24170 [new file with mode: 0644]
src/or/routerlist.c

diff --git a/changes/bug24170 b/changes/bug24170
new file mode 100644 (file)
index 0000000..d3d7347
--- /dev/null
@@ -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.
index d6347c49f62ee8fe04c71c1dfe4e4c336733f0c0..80486cccbc6dfecbb747ec063098052b90787766 100644 (file)
@@ -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;