[or-cvs] [tor/master] When our bridge status changes, forget old geoip data.

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Tue, 12 May 2009 15:35:53 -0400
Subject: When our bridge status changes, forget old geoip data.
Commit: fc091e8a96f2e2db9516f4046bec63f1e17a8f71

This fixes bug 932, where all of our usage totals for users when we
were a regular server would get included in the extrainfo document.
---
 src/or/config.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 71dd391..3d757c1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1329,6 +1329,11 @@ options_act(or_options_t *old_options)
       circuit_expire_all_dirty_circs();
     }
 
+    if (! bool_eq(options->BridgeRelay, old_options->BridgeRelay)) {
+      log_info(LD_GENERAL, "Bridge status changed.  Forgetting GeoIP stats.");
+      geoip_remove_old_clients(time(NULL)+3600);
+    }
+
     if (options_transition_affects_workers(old_options, options)) {
       log_info(LD_GENERAL,
                "Worker-related options changed. Rotating workers.");
-- 
1.5.6.5