commit 90f0358e3e6d70f20436ebe17065b02476dd133c Author: Karsten Loesing karsten.loesing@gmx.net Date: Wed Dec 18 18:00:17 2013 +0100

Disable (Cell,Entry,ExitPort)Statistics on bridges

In 0.2.3.8-alpha we attempted to "completely disable stats if we aren't running as a relay", but instead disabled them only if we aren't running as a server.

This commit leaves DirReqStatistics enabled on both relays and bridges, and disables (Cell,Entry,ExitPort)Statistics on bridges. --- changes/bug5824 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/bug5824 b/changes/bug5824 new file mode 100644 index 0000000..15d366f --- /dev/null +++ b/changes/bug5824 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Bridges now never collect statistics that were designed for relays. + Fix for bug 5824; bugfix on 0.2.3.8-alpha. + diff --git a/src/or/config.c b/src/or/config.c index d348f10..3796858 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1684,10 +1684,14 @@ options_act(const or_options_t *old_options) time_t now = time(NULL); int print_notice = 0;

- /* If we aren't acting as a server, we can't collect stats anyway. */ + /* Only collect directory-request statistics on relays and bridges. */ if (!server_mode(options)) { - options->CellStatistics = 0; options->DirReqStatistics = 0; + } + + /* Only collect other relay-only statistics on relays. */ + if (!public_server_mode(options)) { + options->CellStatistics = 0; options->EntryStatistics = 0; options->ExitPortStatistics = 0; }