aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-12-22 08:34:41 +0100
committerSebastian Hahn <sebastian@torproject.org>2010-12-22 08:34:41 +0100
commitda9190013510412cec00e38c064c5c718d032f9e (patch)
tree63b0ae83b79ec2bc0cf6e520d440bd7715e7227d /src/or
parentd97be399c9b01ee15f8bc83c62ec22f3cb24bc51 (diff)
downloadtor-da9190013510412cec00e38c064c5c718d032f9e.tar.gz
tor-da9190013510412cec00e38c064c5c718d032f9e.zip
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.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 7ca689d0d4..8a185cf7d6 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 "