aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-12-22 08:34:41 +0100
committerSebastian Hahn <sebastian@torproject.org>2011-10-29 11:20:02 +0200
commitdfdb4fde1acbec20b5dedd91005dcf64c730c411 (patch)
treeae1ec9b16bdd41afa9a1bcff4e827c58f889cd1f
parentcf8bffa35901a26ae840dcd715dd2f664259efb3 (diff)
downloadtor-dfdb4fde1acbec20b5dedd91005dcf64c730c411.tar.gz
tor-dfdb4fde1acbec20b5dedd91005dcf64c730c411.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.
-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 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 "