Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2

This commit is contained in:
Nick Mathewson 2011-04-26 11:07:48 -04:00
commit f083347adf
2 changed files with 7 additions and 1 deletions

5
changes/bug2704 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- When writing our maximum bw for the current interval to the state
file, don't wrongly inflate that value by a factor of 10 anymore.
Fixes more of bug 2704.

View File

@ -1614,7 +1614,8 @@ rep_hist_update_bwhist_state_section(or_state_t *state,
}
tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->total_in_period & ~0x3ff));
smartlist_add(*s_values, cp);
tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->max_total & ~0x3ff));
maxval = b->max_total / NUM_SECS_ROLLING_MEASURE;
tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(maxval & ~0x3ff));
smartlist_add(*s_maxima, cp);
}