From: Sebastian Hahn <sebastian@torproject.org>
Date: Wed, 22 Dec 2010 07:34:41 +0000 (+0100)
Subject: Disable stats requiring geoip info if we have none
X-Git-Tag: tor-0.2.3.7-alpha~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfdb4fde1acbec20b5dedd91005dcf64c730c411;p=thirdparty%2Ftor.git

Disable stats requiring geoip info if we have none

In other parts of the code we will otherwise attempt to collect these
statistics, and that will lead to crashes.
---

diff --git a/src/or/config.c b/src/or/config.c
index 78e433620d..ca4e71cccd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1425,6 +1425,7 @@ options_act(or_options_t *old_options)
         geoip_dirreq_stats_init(now);
         print_notice = 1;
       } else {
+        options->DirReqStatistics = 0;
         log_notice(LD_CONFIG, "Configured to measure directory request "
                               "statistics, but no GeoIP database found! "
                               "Please specify a GeoIP database using the "
@@ -1437,6 +1438,7 @@ options_act(or_options_t *old_options)
         geoip_entry_stats_init(now);
         print_notice = 1;
       } else {
+        options->EntryStatistics = 0;
         log_notice(LD_CONFIG, "Configured to measure entry node "
                               "statistics, but no GeoIP database found! "
                               "Please specify a GeoIP database using the "