diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 21 | ||||
| -rw-r--r-- | src/or/router.c | 11 |
2 files changed, 15 insertions, 17 deletions
diff --git a/src/or/control.c b/src/or/control.c index 9f80d38cf..f43525175 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1839,23 +1839,20 @@ getinfo_helper_events(control_connection_t *control_conn, } } else if (!strcmp(question, "status/clients-seen")) { char geoip_start[ISO_TIME_LEN+1]; - char *geoip_summary; - smartlist_t *sl; + size_t answer_len; + char *geoip_summary = extrainfo_get_client_geoip_summary(time(NULL)); - geoip_summary = extrainfo_get_client_geoip_summary(time(NULL)); if (!geoip_summary) return -1; - format_iso_time(geoip_start, geoip_get_history_start()); - - sl = smartlist_create(); - smartlist_add(sl, (char *)"TimeStarted=\""); - smartlist_add(sl, geoip_start); - smartlist_add(sl, (char *)"\" CountrySummary="); - smartlist_add(sl, geoip_summary); - *answer = smartlist_join_strings(sl, "", 0, 0); + answer_len = strlen("TimeStarted=\"\" CountrySummary=") + + ISO_TIME_LEN + strlen(geoip_summary) + 1; + *answer = tor_malloc(answer_len); + format_iso_time(geoip_start, geoip_get_history_start()); + tor_snprintf(*answer, answer_len, + "TimeStarted=\"%s\" CountrySummary=%s", + geoip_start, geoip_summary); tor_free(geoip_summary); - smartlist_free(sl); } else { return 0; } diff --git a/src/or/router.c b/src/or/router.c index 68e775c80..f3e09e6db 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) { |