| 1 |
blueness 11/11/03 21:44:47 |
| 2 |
|
| 3 |
Added: tor-0.2.2.34_disable-stats-requiring-geoip.patch |
| 4 |
Log: |
| 5 |
Patch to fix crash of directory servers if geoip data is not present |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/tor/files/tor-0.2.2.34_disable-stats-requiring-geoip.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/tor-0.2.2.34_disable-stats-requiring-geoip.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/tor-0.2.2.34_disable-stats-requiring-geoip.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: tor-0.2.2.34_disable-stats-requiring-geoip.patch |
| 16 |
=================================================================== |
| 17 |
cbec20b5dedd91005dcf64c730c411 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Sebastian Hahn <sebastian@××××××××××.org> |
| 19 |
Date: Wed, 22 Dec 2010 08:34:41 +0100 |
| 20 |
Subject: [PATCH] Disable stats requiring geoip info if we have none |
| 21 |
|
| 22 |
In other parts of the code we will otherwise attempt to collect these |
| 23 |
statistics, and that will lead to crashes. |
| 24 |
--- |
| 25 |
src/or/config.c | 2 ++ |
| 26 |
1 files changed, 2 insertions(+), 0 deletions(-) |
| 27 |
|
| 28 |
diff --git a/src/or/config.c b/src/or/config.c |
| 29 |
index 78e4336..ca4e71c 100644 |
| 30 |
--- a/src/or/config.c |
| 31 |
+++ b/src/or/config.c |
| 32 |
@@ -1425,6 +1425,7 @@ options_act(or_options_t *old_options) |
| 33 |
geoip_dirreq_stats_init(now); |
| 34 |
print_notice = 1; |
| 35 |
} else { |
| 36 |
+ options->DirReqStatistics = 0; |
| 37 |
log_notice(LD_CONFIG, "Configured to measure directory request " |
| 38 |
"statistics, but no GeoIP database found! " |
| 39 |
"Please specify a GeoIP database using the " |
| 40 |
@@ -1437,6 +1438,7 @@ options_act(or_options_t *old_options) |
| 41 |
geoip_entry_stats_init(now); |
| 42 |
print_notice = 1; |
| 43 |
} else { |
| 44 |
+ options->EntryStatistics = 0; |
| 45 |
log_notice(LD_CONFIG, "Configured to measure entry node " |
| 46 |
"statistics, but no GeoIP database found! " |
| 47 |
"Please specify a GeoIP database using the " |
| 48 |
-- |
| 49 |
1.7.2.5 |
Archives