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

Introduce generic HS stats methods that apply to v2 and v3.

Browse Source
This commit is contained in:
George Kadianakis 2020-11-03 11:04:13 +02:00
parent 3cbc513ae7
commit f2eff17126
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1742,17 +1742,6 @@ hs_v2_stats_free_(hs_v2_stats_t *victim_hs_v2_stats)
tor_free(victim_hs_v2_stats); tor_free(victim_hs_v2_stats);
} }
/** Initialize hidden service statistics. */
void
rep_hist_hs_v2_stats_init(time_t now)
{
if (!hs_v2_stats) {
hs_v2_stats = hs_v2_stats_new();
}
start_of_hs_v2_stats_interval = now;
}
/** Clear history of hidden service statistics and set the measurement /** Clear history of hidden service statistics and set the measurement
* interval start to <b>now</b>. */ * interval start to <b>now</b>. */
static void static void
@ -1770,25 +1759,6 @@ rep_hist_reset_hs_v2_stats(time_t now)
start_of_hs_v2_stats_interval = now; start_of_hs_v2_stats_interval = now;
} }
/** Stop collecting hidden service stats in a way that we can re-start
* doing so in rep_hist_buffer_stats_init(). */
void
rep_hist_hs_v2_stats_term(void)
{
rep_hist_reset_hs_v2_stats(0);
}
/** We saw a new HS relay cell, Count it! */
void
rep_hist_seen_new_rp_cell(void)
{
if (!hs_v2_stats) {
return; // We're not collecting stats
}
hs_v2_stats->rp_relay_cells_seen++;
}
/** As HSDirs, we saw another v2 onion with public key <b>pubkey</b>. Check /** As HSDirs, we saw another v2 onion with public key <b>pubkey</b>. Check
* whether we have counted it before, if not count it now! */ * whether we have counted it before, if not count it now! */
void void
@ -1946,6 +1916,38 @@ rep_hist_seen_new_rp_cell(bool is_v2)
} }
} }
/** Generic HS stats code */
/** Initialize v2 and v3 hidden service statistics. */
void
rep_hist_hs_stats_init(time_t now)
{
if (!hs_v2_stats) {
hs_v2_stats = hs_v2_stats_new();
}
/* Start collecting v2 stats straight away */
start_of_hs_v2_stats_interval = now;
if (!hs_v3_stats) {
hs_v3_stats = hs_v3_stats_new();
}
/* Start collecting v3 stats at the next 12:00 UTC */
start_of_hs_v3_stats_interval = hs_get_start_time_of_next_time_period(now);
}
/** Stop collecting hidden service stats in a way that we can re-start
* doing so in rep_hist_buffer_stats_init(). */
void
rep_hist_hs_stats_term(void)
{
rep_hist_reset_hs_v2_stats(0);
rep_hist_reset_hs_v3_stats(0);
}
/** Stats reporting code */
/* The number of cells that are supposed to be hidden from the adversary /* The number of cells that are supposed to be hidden from the adversary
* by adding noise from the Laplace distribution. This value, divided by * by adding noise from the Laplace distribution. This value, divided by
* EPSILON, is Laplace parameter b. It must be greather than 0. */ * EPSILON, is Laplace parameter b. It must be greather than 0. */