nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-03-01 17:15:37 -05:00
commit d60a7c2f8d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/rephist.c
View File

@ -1607,18 +1607,24 @@ rep_hist_load_bwhist_state_section(bw_array_t *b,
b->cur_obs_time = start; b->cur_obs_time = start;
b->next_period = start + NUM_SECS_BW_SUM_INTERVAL; b->next_period = start + NUM_SECS_BW_SUM_INTERVAL;
SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) { SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) {
const char *maxstr = NULL;
v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL); v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL);
if (have_maxima) { if (have_maxima) {
const char *maxstr = smartlist_get(s_maxima, cp_sl_idx); maxstr = smartlist_get(s_maxima, cp_sl_idx);
mv = tor_parse_uint64(maxstr, 10, 0, UINT64_MAX, &ok_m, NULL); mv = tor_parse_uint64(maxstr, 10, 0, UINT64_MAX, &ok_m, NULL);
mv *= NUM_SECS_ROLLING_MEASURE; mv *= NUM_SECS_ROLLING_MEASURE;
} else { } else {
/* No maxima known; guess average rate to be conservative. */ /* No maxima known; guess average rate to be conservative. */
mv = v / s_interval; mv = v / s_interval;
} }
if (!ok || !ok_m) { if (!ok) {
retval = -1; retval = -1;
log_notice(LD_HIST, "Could not parse '%s' into a number.'", cp); log_notice(LD_HIST, "Could not parse value '%s' into a number.'",cp);
}
if (maxstr && !ok_m) {
retval = -1;
log_notice(LD_HIST, "Could not parse maximum '%s' into a number.'",
maxstr);
} }
if (start < now) { if (start < now) {