[or-cvs] [tor/master] Disable stats requiring geoip info if we have none

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Wed, 22 Dec 2010 08:34:41 +0100
Subject: Disable stats requiring geoip info if we have none
Commit: da9190013510412cec00e38c064c5c718d032f9e

In other parts of the code we will otherwise attempt to collect these
statistics, and that will lead to crashes.
---
 src/or/config.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 7ca689d..8a185cf 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1385,6 +1385,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 "
@@ -1397,6 +1398,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 "
-- 
1.7.1