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

delay geoip stats even more for relays-turned-bridges

Browse Source
This commit is contained in:
Roger Dingledine 2010-08-18 16:12:44 -04:00
parent e7956d4a73
commit c1260cb6ec
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bridge-geoip-delay Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes:
- Delay geoip stats collection by bridges for 6 hours, not 2 hours,
when we switch from being a public relay to a bridge. Otherwise
there will still be clients that see the relay in their consensus,
and the stats will end up wrong. Bugfix on 0.2.1.15-rc; fixes bug
932 even more.

7
src/or/config.c
View File

@ -1255,8 +1255,9 @@ options_act(or_options_t *old_options)
/* How long should we delay counting bridge stats after becoming a bridge? /* How long should we delay counting bridge stats after becoming a bridge?
* We use this so we don't count people who used our bridge thinking it is * We use this so we don't count people who used our bridge thinking it is
* a relay. If you change this, don't forget to change the log message * a relay. If you change this, don't forget to change the log message
* below. */ * below. It's 4 hours (the time it takes to stop being used by clients)
#define RELAY_BRIDGE_STATS_DELAY (2 * 60 * 60) * plus some extra time for clock skew. */
#define RELAY_BRIDGE_STATS_DELAY (6 * 60 * 60)
if (! bool_eq(options->BridgeRelay, old_options->BridgeRelay)) { if (! bool_eq(options->BridgeRelay, old_options->BridgeRelay)) {
int was_relay = 0; int was_relay = 0;
@ -1268,7 +1269,7 @@ options_act(or_options_t *old_options)
} }
geoip_bridge_stats_init(int_start); geoip_bridge_stats_init(int_start);
log_info(LD_CONFIG, "We are acting as a bridge now. Starting new " log_info(LD_CONFIG, "We are acting as a bridge now. Starting new "
"GeoIP stats interval%s.", was_relay ? " in 2 " "GeoIP stats interval%s.", was_relay ? " in 6 "
"hours from now" : ""); "hours from now" : "");
} else { } else {
geoip_bridge_stats_term(); geoip_bridge_stats_term();