diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-09-23 08:29:58 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-09-23 08:29:58 +0000 |
| commit | 03d0f62da07f1e222d8e67ec71cc79bd7d7a9e1c (patch) | |
| tree | e93cd9140718b809e8a6b5241fe29d37f7593080 /src/or/rephist.c | |
| parent | 12e10aeaf21ba6257e9e43b50e1aa6f7069a7f21 (diff) | |
| download | tor-03d0f62da07f1e222d8e67ec71cc79bd7d7a9e1c.tar.gz tor-03d0f62da07f1e222d8e67ec71cc79bd7d7a9e1c.zip | |
make the numbers in read-history and write-history into uint64s,
so they don't overflow and publish negatives in the descriptor.
fixes bug 193.
svn:r5119
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index e561675b98..9742501352 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -399,7 +399,7 @@ typedef struct bw_array_t { int total_obs; /**< Total for all members of obs except obs[cur_obs_idx] */ int max_total; /**< Largest value that total_obs has taken on in the current * period. */ - int total_in_period; /**< Total bytes transferred in the current period. */ + uint64_t total_in_period; /**< Total bytes transferred in the current period. */ /** When does the next period begin? */ time_t next_period; @@ -414,7 +414,7 @@ typedef struct bw_array_t { int maxima[NUM_TOTALS]; /** Circular array of the total bandwidth usage for the last NUM_TOTALS * periods */ - int totals[NUM_TOTALS]; + uint64_t totals[NUM_TOTALS]; } bw_array_t; /** Shift the current period of b forward by one. @@ -590,15 +590,16 @@ rep_hist_get_bandwidth_lines(void) size_t len; /* opt (read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n,n,n... */ - len = (60+12*NUM_TOTALS)*2; + len = (60+20*NUM_TOTALS)*2; buf = tor_malloc_zero(len); cp = buf; for (r=0;r<2;++r) { b = r?read_array:write_array; tor_assert(b); format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL); - tor_snprintf(cp, len-(cp-buf), "opt %s %s (%d s) ", r?"read-history ":"write-history", t, - NUM_SECS_BW_SUM_INTERVAL); + tor_snprintf(cp, len-(cp-buf), "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) @@ -612,9 +613,11 @@ rep_hist_get_bandwidth_lines(void) for (n=0; n<b->num_maxes_set; ++n,++i) { while (i >= NUM_TOTALS) i -= NUM_TOTALS; if (n==(b->num_maxes_set-1)) - tor_snprintf(cp, len-(cp-buf), "%d", b->totals[i]); + tor_snprintf(cp, len-(cp-buf), U64_FORMAT, + U64_PRINTF_ARG(b->totals[i])); else - tor_snprintf(cp, len-(cp-buf), "%d,", b->totals[i]); + tor_snprintf(cp, len-(cp-buf), U64_FORMAT",", + U64_PRINTF_ARG(b->totals[i])); cp += strlen(cp); } strlcat(cp, "\n", len-(cp-buf)); |