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

Abstract v2/v3 "format stats to str" logic into a single function.

Browse Source
This commit is contained in:
George Kadianakis 2020-10-21 17:00:08 +03:00
parent 6178a64fcf
commit a96432ab06
3 changed files with 27 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/feature/stats/rephist.c
View File

@ -1972,86 +1972,53 @@ rep_hist_hs_stats_term(void)
#define ONIONS_SEEN_BIN_SIZE 8 #define ONIONS_SEEN_BIN_SIZE 8
/** Allocate and return a string containing hidden service stats that /** Allocate and return a string containing hidden service stats that
* are meant to be placed in the extra-info descriptor. */ * are meant to be placed in the extra-info descriptor.
*
* Function works for both v2 and v3 stats depending on <b>is_v3</b>. */
STATIC char * STATIC char *
rep_hist_format_hs_v2_stats(time_t now) rep_hist_format_hs_stats(time_t now, bool is_v3)
{ {
char t[ISO_TIME_LEN+1]; char t[ISO_TIME_LEN+1];
char *hs_v2_stats_string; char *hs_stats_string;
int64_t obfuscated_cells_seen;
int64_t obfuscated_onions_seen;
uint64_t rounded_cells_seen
= round_uint64_to_next_multiple_of(hs_v2_stats->rp_v2_relay_cells_seen,
REND_CELLS_BIN_SIZE);
rounded_cells_seen = MIN(rounded_cells_seen, INT64_MAX);
obfuscated_cells_seen = add_laplace_noise((int64_t)rounded_cells_seen,
crypto_rand_double(),
REND_CELLS_DELTA_F, REND_CELLS_EPSILON);
uint64_t rounded_onions_seen =
round_uint64_to_next_multiple_of((size_t)digestmap_size(
hs_v2_stats->v2_onions_seen_this_period),
ONIONS_SEEN_BIN_SIZE);
rounded_onions_seen = MIN(rounded_onions_seen, INT64_MAX);
obfuscated_onions_seen = add_laplace_noise((int64_t)rounded_onions_seen,
crypto_rand_double(), ONIONS_SEEN_DELTA_F,
ONIONS_SEEN_EPSILON);
format_iso_time(t, now);
tor_asprintf(&hs_v2_stats_string, "hidserv-stats-end %s (%d s)\n"
"hidserv-rend-relayed-cells %"PRId64" delta_f=%d "
"epsilon=%.2f bin_size=%d\n"
"hidserv-dir-onions-seen %"PRId64" delta_f=%d "
"epsilon=%.2f bin_size=%d\n",
t, (unsigned) (now - start_of_hs_v2_stats_interval),
(obfuscated_cells_seen), REND_CELLS_DELTA_F,
REND_CELLS_EPSILON, REND_CELLS_BIN_SIZE,
(obfuscated_onions_seen), ONIONS_SEEN_DELTA_F,
ONIONS_SEEN_EPSILON, ONIONS_SEEN_BIN_SIZE);
return hs_v2_stats_string;
}
/** Allocate and return a string containing hidden service stats that
* are meant to be placed in the extra-info descriptor. */
STATIC char *
rep_hist_format_hs_v3_stats(time_t now)
{
char t[ISO_TIME_LEN+1];
char *hs_v3_stats_string;
int64_t obfuscated_onions_seen, obfuscated_cells_seen; int64_t obfuscated_onions_seen, obfuscated_cells_seen;
uint64_t rp_cells_seen = is_v3 ?
hs_v3_stats->rp_v3_relay_cells_seen : hs_v2_stats->rp_v2_relay_cells_seen;
size_t onions_seen = is_v3 ?
digestmap_size(hs_v3_stats->v3_onions_seen_this_period) :
digestmap_size(hs_v2_stats->v2_onions_seen_this_period);
time_t start_of_hs_stats_interval = is_v3 ?
start_of_hs_v3_stats_interval : start_of_hs_v2_stats_interval;
uint64_t rounded_cells_seen uint64_t rounded_cells_seen
= round_uint64_to_next_multiple_of(hs_v3_stats->rp_v3_relay_cells_seen, = round_uint64_to_next_multiple_of(rp_cells_seen, REND_CELLS_BIN_SIZE);
REND_CELLS_BIN_SIZE);
rounded_cells_seen = MIN(rounded_cells_seen, INT64_MAX); rounded_cells_seen = MIN(rounded_cells_seen, INT64_MAX);
obfuscated_cells_seen = add_laplace_noise((int64_t)rounded_cells_seen, obfuscated_cells_seen = add_laplace_noise((int64_t)rounded_cells_seen,
crypto_rand_double(), crypto_rand_double(),
REND_CELLS_DELTA_F, REND_CELLS_EPSILON); REND_CELLS_DELTA_F, REND_CELLS_EPSILON);
uint64_t rounded_onions_seen = uint64_t rounded_onions_seen =
round_uint64_to_next_multiple_of((size_t)digestmap_size( round_uint64_to_next_multiple_of(onions_seen, ONIONS_SEEN_BIN_SIZE);
hs_v3_stats->v3_onions_seen_this_period),
ONIONS_SEEN_BIN_SIZE);
rounded_onions_seen = MIN(rounded_onions_seen, INT64_MAX); rounded_onions_seen = MIN(rounded_onions_seen, INT64_MAX);
obfuscated_onions_seen = add_laplace_noise((int64_t)rounded_onions_seen, obfuscated_onions_seen = add_laplace_noise((int64_t)rounded_onions_seen,
crypto_rand_double(), ONIONS_SEEN_DELTA_F, crypto_rand_double(), ONIONS_SEEN_DELTA_F,
ONIONS_SEEN_EPSILON); ONIONS_SEEN_EPSILON);
format_iso_time(t, now); format_iso_time(t, now);
tor_asprintf(&hs_v3_stats_string, "hidserv-v3-stats-end %s (%d s)\n" tor_asprintf(&hs_stats_string, "%s %s (%d s)\n"
"hidserv-rend-v3-relayed-cells %"PRId64" delta_f=%d " "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n"
"epsilon=%.2f bin_size=%d\n" "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n",
"hidserv-dir-v3-onions-seen %"PRId64" delta_f=%d " is_v3 ? "hidserv-v3-stats-end" : "hidserv-stats-end",
"epsilon=%.2f bin_size=%d\n", t, (unsigned) (now - start_of_hs_stats_interval),
t, (unsigned) (now - start_of_hs_v3_stats_interval), is_v3 ?
"hidserv-rend-v3-relayed-cells" : "hidserv-rend-relayed-cells",
(obfuscated_cells_seen), REND_CELLS_DELTA_F, (obfuscated_cells_seen), REND_CELLS_DELTA_F,
REND_CELLS_EPSILON, REND_CELLS_BIN_SIZE, REND_CELLS_EPSILON, REND_CELLS_BIN_SIZE,
is_v3 ? "hidserv-dir-v3-onions-seen" :"hidserv-dir-onions-seen",
(obfuscated_onions_seen), ONIONS_SEEN_DELTA_F, (obfuscated_onions_seen), ONIONS_SEEN_DELTA_F,
ONIONS_SEEN_EPSILON, ONIONS_SEEN_BIN_SIZE); ONIONS_SEEN_EPSILON, ONIONS_SEEN_BIN_SIZE);
return hs_v3_stats_string; return hs_stats_string;
} }
/** If 24 hours have passed since the beginning of the current HS /** If 24 hours have passed since the beginning of the current HS
@ -2077,8 +2044,7 @@ rep_hist_hs_stats_write(time_t now, bool is_v3)
} }
/* Generate history string. */ /* Generate history string. */
str = is_v3 ? str = rep_hist_format_hs_stats(now, is_v3);
rep_hist_format_hs_v3_stats(now) : rep_hist_format_hs_v2_stats(now);
/* Reset HS history. */ /* Reset HS history. */
if (is_v3) { if (is_v3) {

4
src/feature/stats/rephist.h
View File

@ -116,11 +116,9 @@ typedef struct hs_v3_stats_t {
digestmap_t *v3_onions_seen_this_period; digestmap_t *v3_onions_seen_this_period;
} hs_v3_stats_t; } hs_v3_stats_t;
STATIC char *rep_hist_format_hs_v2_stats(time_t now);
STATIC char *rep_hist_format_hs_v3_stats(time_t now);
MOCK_DECL(STATIC bool, should_collect_v3_stats,(void)); MOCK_DECL(STATIC bool, should_collect_v3_stats,(void));
STATIC char *rep_hist_format_hs_stats(time_t now, bool is_v3);
#endif /* defined(REPHIST_PRIVATE) */ #endif /* defined(REPHIST_PRIVATE) */
/** /**

2
src/test/test_stats.c
View File

@ -608,7 +608,7 @@ test_rephist_v3_onions(void *arg)
/* Because of differential privacy we can't actually check the stat value, /* Because of differential privacy we can't actually check the stat value,
but let's just check that it's formatted correctly. */ but let's just check that it's formatted correctly. */
stats_string = rep_hist_format_hs_v3_stats(approx_time(), true); stats_string = rep_hist_format_hs_stats(approx_time(), true);
tt_assert(strstr(stats_string, "hidserv-dir-v3-onions-seen")); tt_assert(strstr(stats_string, "hidserv-dir-v3-onions-seen"));
done: done: