From 59fdab43cd21ccee2d8712111dc8ba81c7791150 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 10 Jan 2008 17:48:32 +0000 Subject: [PATCH] r17552@catbus: nickm | 2008-01-10 12:13:43 -0500 Make bridge geoip data get rounded up, not down. svn:r13092 --- ChangeLog | 1 + doc/TODO | 2 +- src/or/geoip.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41d62933cc..ac4152bdda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ Changes in version 0.2.0.16-alpha - 2008-01-?? on 0.2.0.15-alpha. - Do not try to download missing certificates until we have tried to check our fallback consensus. Fixes bug 583. + - Make bridges round geoip info up, not down. o Minor features (controller): - Get NS events working again. (Patch from tup) diff --git a/doc/TODO b/doc/TODO index 5fa7124492..875f716212 100644 --- a/doc/TODO +++ b/doc/TODO @@ -40,7 +40,7 @@ N - add a bit in the dir_connection_t. or check whether the linked conn - Mention in control-spec.txt D have normal relays report geoip stats too. D different thresholds for bridges than for normal relays. -N - bridge relays round geoip stats *up*, not down. + o bridge relays round geoip stats *up*, not down. R - bridge communities . spec . deploy diff --git a/src/or/geoip.c b/src/or/geoip.c index 07928affc9..9ae1bb2881 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -354,6 +354,8 @@ geoip_get_client_history(time_t now) c_hist_t *ent; /* Only report a country if it has a minimum number of IPs. */ if (c >= MIN_IPS_TO_NOTE_COUNTRY) { + /* Round up to the next multiple of IP_GRANULARITY */ + c += IP_GRANULARITY-1; c -= c % IP_GRANULARITY; countrycode = geoip_get_country_name(i); ent = tor_malloc(sizeof(c_hist_t));