The bridge GeoIP stats were counting other relays, for example

self-reachability and authority-reachability tests.

svn:r12960

diff --git a/ChangeLog b/ChangeLog
index 8cecf978d54eec0af0fa21a9c5fedfb980891f08..8c6ab91ee005341c76437bcb832763ee676da322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Changes in version 0.2.0.15-alpha - 2007-12-24
       previously unreachable, mark it as retriable so we won't just
       ignore it. Also, try fetching a new copy immediately. Bugfixes
       on 0.2.0.13-alpha.
+    - The bridge GeoIP stats were counting other relays, for example
+      self-reachability and authority-reachability tests.
 
   o Minor features:
     - Support compilation to target iPhone; patch from cjacker huang.

diff --git a/doc/TODO b/doc/TODO
index 4d5588deccd2c7a1e29066d9340ba4f6009b495c..aefeb2f2d2f164e52bfd0a563dbb7509f5993e58 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -48,7 +48,7 @@ R   . spec
       - Write some basic unit tests.
     - Mention in dir-spec.txt
     - Mention in control-spec.txt
-    - we count hits from our reachability tests too. stop that somehow.
+    o we count hits from our reachability tests too. stop that somehow.
     - have normal relays report geoip stats too.
     - different thresholds for bridges than for normal relays.
     d let Vidalia use the geoip data too rather than doing its own

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index dd49af93c19d5e3ccf6e0c4de5bdf04200e06164..e9d9a877d0a121636656b4033d884b9043e61140 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -906,7 +906,9 @@ connection_or_set_state_open(or_connection_t *conn)
     }
     router_set_status(conn->identity_digest, 1);
   } else {
-    geoip_note_client_seen(TO_CONN(conn)->addr, now);
+    /* only report it to the geoip module if it's not a known router */
+    if (!router_get_by_digest(conn->identity_digest))
+      geoip_note_client_seen(TO_CONN(conn)->addr, now);
   }
   if (conn->handshake_state) {
     or_handshake_state_free(conn->handshake_state);