Fix bug 932 even more.

Ignore connections two hours after switching from bridge to relay or back.

diff --git a/src/or/config.c b/src/or/config.c
index 25364b6a33af12adc51b748bf254c24e19282403..6030849a1c9946f46d7037f131a439ad4908a1a3 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1331,7 +1331,7 @@ options_act(or_options_t *old_options)
 
     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);
+      geoip_remove_old_clients(time(NULL)+(2*60*60));
     }
 
     if (options_transition_affects_workers(old_options, options)) {

diff --git a/src/or/geoip.c b/src/or/geoip.c
index eb0d7e43f4c94d9d761131a325eb458da816ed7b..e1477d4eabe82c3fc979fadb52ae1af81b1473f3 100644 (file)
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -308,6 +308,9 @@ geoip_note_client_seen(geoip_client_action_t action,
   if (action == GEOIP_CLIENT_CONNECT) {
     if (!(options->BridgeRelay && options->BridgeRecordUsageByCountry))
       return;
+    /* Did we recently switch from bridge to relay or back? */
+    if (client_history_starts > now)
+      return;
   } else {
 #ifndef ENABLE_GEOIP_STATS
     return;