From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 8 Aug 2004 19:14:44 +0000 (+0000)
Subject: Fix a fencepost error in the last bandwidth reporting fix
X-Git-Tag: tor-0.0.8pre3~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0652a0e90a9b04fd5cc80f376788763e3122713b;p=thirdparty%2Ftor.git

Fix a fencepost error in the last bandwidth reporting fix


svn:r2202
---

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 5159aa51fa..af780e48cd 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -506,13 +506,16 @@ char *rep_hist_get_bandwidth_lines(void)
   for (r=0;r<2;++r) {
     b = r?read_array:write_array;
     format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL);
-    sprintf(cp, "opt %s %s (%d s)", r?"read-history ":"write-history", t,
+    sprintf(cp, "opt %s %s (%d s) ", r?"read-history ":"write-history", t,
             NUM_SECS_BW_SUM_INTERVAL);
     cp += strlen(cp);
 
-    if (b->num_maxes_set < b->next_max_idx)
+    if (b->num_maxes_set <= b->next_max_idx)
+      /* We haven't been through the circular array yet; time starts at i=0.*/
       i = 0;
     else
+      /* We've been arround the array at least once.  The next i to be
+         overwritten is the oldest. */
       i = b->next_max_idx;
 
     for (n=0; n<b->num_maxes_set; ++n,++i) {