summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-01-28 07:16:22 +0000
committerRoger Dingledine <arma@torproject.org>2009-01-28 07:16:22 +0000
commit9fdae765e30695fdb7018c4b30932e3e4e28d144 (patch)
tree7bec6cb42d326233d1c99dda2d935e84f169f1bf /src/or/router.c
parentedff6063172ad4fb6a835b2c218856aa93efe8da (diff)
downloadtor-9fdae765e30695fdb7018c4b30932e3e4e28d144.tar.gz
tor-9fdae765e30695fdb7018c4b30932e3e4e28d144.zip
clean up r18287
svn:r18288
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 68e775c806..f3e09e6db2 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1906,11 +1906,12 @@ extrainfo_dump_to_string(char *s, size_t maxlen, extrainfo_t *extrainfo,
return (int)strlen(s)+1;
}
-/** Return a newly allocated comma-separated string containing entries for all
- * the countries from which we've seen enough clients connect over the
- * previous 48 hours. The entry format is cc=num where num is the number of
- * IPs we've seen connecting from that country, and cc is a lowercased
- * country code. Returns NULL if we don't want to export geoip data yet. */
+/** Wrapper function for geoip_get_client_history(). It first discards
+ * any items in the client history that are too old -- it dumps anything
+ * more than 48 hours old, but it only considers whether to dump at most
+ * once per 48 hours, so we aren't too precise to an observer (see also
+ * r14780).
+ */
char *
extrainfo_get_client_geoip_summary(time_t now)
{