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

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-04-28 16:05:59 -04:00
commit 88638d40ca
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket2497 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Ensure that no empty [dirreq-](read|write)-history lines are added
to an extrainfo document. Implements ticket 2497.

14
src/or/rephist.c
View File

@ -1530,10 +1530,15 @@ rep_hist_get_bandwidth_lines(void)
size_t len; size_t len;
/* opt [dirreq-](read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n... */ /* opt [dirreq-](read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n... */
len = (67+21*NUM_TOTALS)*4; /* The n,n,n part above. Largest representation of a uint64_t is 20 chars
* long, plus the comma. */
#define MAX_HIST_VALUE_LEN 21*NUM_TOTALS
len = (67+MAX_HIST_VALUE_LEN)*4;
buf = tor_malloc_zero(len); buf = tor_malloc_zero(len);
cp = buf; cp = buf;
for (r=0;r<4;++r) { for (r=0;r<4;++r) {
char tmp[MAX_HIST_VALUE_LEN];
size_t slen;
switch (r) { switch (r) {
case 0: case 0:
b = write_array; b = write_array;
@ -1553,11 +1558,16 @@ rep_hist_get_bandwidth_lines(void)
break; break;
} }
tor_assert(b); tor_assert(b);
slen = rep_hist_fill_bandwidth_history(tmp, MAX_HIST_VALUE_LEN, b);
/* If we don't have anything to write, skip to the next entry. */
if (slen == 0)
continue;
format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL); format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL);
tor_snprintf(cp, len-(cp-buf), "%s %s (%d s) ", tor_snprintf(cp, len-(cp-buf), "%s %s (%d s) ",
desc, t, NUM_SECS_BW_SUM_INTERVAL); desc, t, NUM_SECS_BW_SUM_INTERVAL);
cp += strlen(cp); cp += strlen(cp);
cp += rep_hist_fill_bandwidth_history(cp, len-(cp-buf), b); strlcat(cp, tmp, len-(cp-buf));
cp += slen;
strlcat(cp, "\n", len-(cp-buf)); strlcat(cp, "\n", len-(cp-buf));
++cp; ++cp;
} }