[or-cvs] r14930: Bridge relays no longer print "xx=0" in their extrainfo docu (in tor/branches/tor-0_2_0-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-04 03:40:59 -0400 (Wed, 04 Jun 2008)
New Revision: 14930

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/geoip.c
Log:
Bridge relays no longer print "xx=0" in their extrainfo document
for every single country code in the geoip db.


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-04 07:08:05 UTC (rev 14929)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-04 07:40:59 UTC (rev 14930)
@@ -1,6 +1,8 @@
 Changes in version 0.2.0.28-rc - 2008-06-??
   o Minor fixes:
-    - Fix unit tests in 0.2.0.27-rc. [Actually, one is still broken!]
+    - Bridge relays no longer print "xx=0" in their extrainfo document
+      for every single country code in the geoip db.
+    - Fix unit tests in 0.2.0.27-rc.
     - Fix compile on Windows.
 
 

Modified: tor/branches/tor-0_2_0-patches/src/or/geoip.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/geoip.c	2008-06-04 07:08:05 UTC (rev 14929)
+++ tor/branches/tor-0_2_0-patches/src/or/geoip.c	2008-06-04 07:40:59 UTC (rev 14930)
@@ -362,7 +362,7 @@
 #if MIN_IPS_TO_NOTE_COUNTRY > 0
       if (c >= MIN_IPS_TO_NOTE_COUNTRY) {
 #else
-      if (1) {
+      if (c > 0) {
 #endif
         /* Round up to the next multiple of IP_GRANULARITY */
         c += IP_GRANULARITY-1;