From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 May 2021 14:08:52 +0000 (-0400)
Subject: Make client heartbeat stats tied to the heartbeat period.
X-Git-Tag: tor-0.4.7.1-alpha~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e140c530cf8c080ec6c1bb8aeb82e5a0c6dd1ff;p=thirdparty%2Ftor.git

Make client heartbeat stats tied to the heartbeat period.

Patch from cypherpunks. Closes #40330.
---

diff --git a/src/feature/stats/geoip_stats.c b/src/feature/stats/geoip_stats.c
index b4b107c3f7..a0fe8597c1 100644
--- a/src/feature/stats/geoip_stats.c
+++ b/src/feature/stats/geoip_stats.c
@@ -1206,11 +1206,11 @@ format_bridge_stats_controller(time_t now)
 char *
 format_client_stats_heartbeat(time_t now)
 {
-  const int n_hours = 6;
+  const int n_seconds = get_options()->HeartbeatPeriod;
   char *out = NULL;
   int n_clients = 0;
   clientmap_entry_t **ent;
-  unsigned cutoff = (unsigned)( (now-n_hours*3600)/60 );
+  unsigned cutoff = (unsigned)( (now-n_seconds)/60 );
 
   if (!start_of_bridge_stats_interval)
     return NULL; /* Not initialized. */
@@ -1226,8 +1226,7 @@ format_client_stats_heartbeat(time_t now)
   }
 
   tor_asprintf(&out, "Heartbeat: "
-               "In the last %d hours, I have seen %d unique clients.",
-               n_hours,
+               "Since last heartbeat message, I have seen %d unique clients.",
                n_clients);
 
   return out;