October 2011 - tor-commits - lists.torproject.org

[tor/master] Turn on directory request statistics by default.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 9dfb8845229ed66efb2222b8dec6c624f8adb7c9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 9 14:18:00 2010 +0100 Turn on directory request statistics by default. Change the default values for collecting directory request statistics and inlcuding them in extra-info descriptors to 1. Don't break if we are configured to collect directory request or entry statistics and don't have a GeoIP database. Instead, print out a notice and skip initializing the affected statistics code. This is the cherry-picked 499661524b0a572303087af721325608dd91f7ce. --- changes/dirreq-stats-default | 4 ++ src/or/config.c | 63 +++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default new file mode 100644 index 0000000..673be6a --- /dev/null +++ b/changes/dirreq-stats-default @@ -0,0 +1,4 @@ + o Minor features: + - Turn on directory request statistics by default and include them in + extra-info descriptors. Don't break if we have no GeoIP database. + diff --git a/src/or/config.c b/src/or/config.c index 8972506..230ccf2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -229,7 +229,7 @@ static config_var_t _option_vars[] = { OBSOLETE("DirRecordUsageGranularity"), OBSOLETE("DirRecordUsageRetainIPs"), OBSOLETE("DirRecordUsageSaveInterval"), - V(DirReqStatistics, BOOL, "0"), + V(DirReqStatistics, BOOL, "1"), VAR("DirServer", LINELIST, DirServers, NULL), V(DisableAllSwap, BOOL, "0"), V(DNSPort, PORT, "0"), @@ -246,7 +246,7 @@ static config_var_t _option_vars[] = { V(ExitPolicy, LINELIST, NULL), V(ExitPolicyRejectPrivate, BOOL, "1"), V(ExitPortStatistics, BOOL, "0"), - V(ExtraInfoStatistics, BOOL, "0"), + V(ExtraInfoStatistics, BOOL, "1"), #if defined (WINCE) V(FallbackNetworkstatusFile, FILENAME, "fallback-consensus"), @@ -1408,44 +1408,45 @@ options_act(or_options_t *old_options) tor_free(actual_fname); } - if (options->DirReqStatistics && !geoip_is_loaded()) { - /* Check if GeoIP database could be loaded. */ - log_warn(LD_CONFIG, "Configured to measure directory request " - "statistics, but no GeoIP database found!"); - return -1; - } - - if (options->EntryStatistics) { - if (should_record_bridge_info(options)) { - /* Don't allow measuring statistics on entry guards when configured - * as bridge. */ - log_warn(LD_CONFIG, "Bridges cannot be configured to measure " - "additional GeoIP statistics as entry guards."); - return -1; - } else if (!geoip_is_loaded()) { - /* Check if GeoIP database could be loaded. */ - log_warn(LD_CONFIG, "Configured to measure entry node statistics, " - "but no GeoIP database found!"); - return -1; - } - } - if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics) { time_t now = time(NULL); + int print_notice = 0; if ((!old_options || !old_options->CellStatistics) && - options->CellStatistics) + options->CellStatistics) { rep_hist_buffer_stats_init(now); + print_notice = 1; + } if ((!old_options || !old_options->DirReqStatistics) && - options->DirReqStatistics) - geoip_dirreq_stats_init(now); + options->DirReqStatistics) { + if (geoip_is_loaded()) { + geoip_dirreq_stats_init(now); + print_notice = 1; + } else { + log_notice(LD_CONFIG, "Configured to measure directory request " + "statistics, but no GeoIP database found! " + "Please specify a GeoIP database using the " + "GeoIPFile option!"); + } + } if ((!old_options || !old_options->EntryStatistics) && - options->EntryStatistics) - geoip_entry_stats_init(now); + options->EntryStatistics && !should_record_bridge_info(options)) { + if (geoip_is_loaded()) { + geoip_entry_stats_init(now); + print_notice = 1; + } else { + log_notice(LD_CONFIG, "Configured to measure entry node " + "statistics, but no GeoIP database found! " + "Please specify a GeoIP database using the " + "GeoIPFile option!"); + } + } if ((!old_options || !old_options->ExitPortStatistics) && - options->ExitPortStatistics) + options->ExitPortStatistics) { rep_hist_exit_stats_init(now); - if (!old_options) + print_notice = 1; + } + if (print_notice) log_notice(LD_CONFIG, "Configured to measure statistics. Look for " "the *-stats files that will first be written to the " "data directory in 24 hours from now.");

1 0

[tor/master] Note ticket and source version for feature3951 in changes file
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit f37d24c550a0d8512249f77262c01960af6ed31b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:47:43 2011 -0400 Note ticket and source version for feature3951 in changes file --- changes/dirreq-stats-default | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default index 673be6a..df7ac11 100644 --- a/changes/dirreq-stats-default +++ b/changes/dirreq-stats-default @@ -1,4 +1,5 @@ o Minor features: - Turn on directory request statistics by default and include them in extra-info descriptors. Don't break if we have no GeoIP database. + Backported from 0.2.3.1-alpha; implements ticket 3951.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 19f1d3e331dfa34ab78d9bb90c61674e49ceae52 Merge: 1ec22ea f37d24c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:49:52 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' This merge is here to take a commit (feature 3951) that we already have in master, so use "merge -s ours"

1 0

[tor/maint-0.2.2] Turn on directory request statistics by default.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 9dfb8845229ed66efb2222b8dec6c624f8adb7c9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 9 14:18:00 2010 +0100 Turn on directory request statistics by default. Change the default values for collecting directory request statistics and inlcuding them in extra-info descriptors to 1. Don't break if we are configured to collect directory request or entry statistics and don't have a GeoIP database. Instead, print out a notice and skip initializing the affected statistics code. This is the cherry-picked 499661524b0a572303087af721325608dd91f7ce. --- changes/dirreq-stats-default | 4 ++ src/or/config.c | 63 +++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default new file mode 100644 index 0000000..673be6a --- /dev/null +++ b/changes/dirreq-stats-default @@ -0,0 +1,4 @@ + o Minor features: + - Turn on directory request statistics by default and include them in + extra-info descriptors. Don't break if we have no GeoIP database. + diff --git a/src/or/config.c b/src/or/config.c index 8972506..230ccf2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -229,7 +229,7 @@ static config_var_t _option_vars[] = { OBSOLETE("DirRecordUsageGranularity"), OBSOLETE("DirRecordUsageRetainIPs"), OBSOLETE("DirRecordUsageSaveInterval"), - V(DirReqStatistics, BOOL, "0"), + V(DirReqStatistics, BOOL, "1"), VAR("DirServer", LINELIST, DirServers, NULL), V(DisableAllSwap, BOOL, "0"), V(DNSPort, PORT, "0"), @@ -246,7 +246,7 @@ static config_var_t _option_vars[] = { V(ExitPolicy, LINELIST, NULL), V(ExitPolicyRejectPrivate, BOOL, "1"), V(ExitPortStatistics, BOOL, "0"), - V(ExtraInfoStatistics, BOOL, "0"), + V(ExtraInfoStatistics, BOOL, "1"), #if defined (WINCE) V(FallbackNetworkstatusFile, FILENAME, "fallback-consensus"), @@ -1408,44 +1408,45 @@ options_act(or_options_t *old_options) tor_free(actual_fname); } - if (options->DirReqStatistics && !geoip_is_loaded()) { - /* Check if GeoIP database could be loaded. */ - log_warn(LD_CONFIG, "Configured to measure directory request " - "statistics, but no GeoIP database found!"); - return -1; - } - - if (options->EntryStatistics) { - if (should_record_bridge_info(options)) { - /* Don't allow measuring statistics on entry guards when configured - * as bridge. */ - log_warn(LD_CONFIG, "Bridges cannot be configured to measure " - "additional GeoIP statistics as entry guards."); - return -1; - } else if (!geoip_is_loaded()) { - /* Check if GeoIP database could be loaded. */ - log_warn(LD_CONFIG, "Configured to measure entry node statistics, " - "but no GeoIP database found!"); - return -1; - } - } - if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics) { time_t now = time(NULL); + int print_notice = 0; if ((!old_options || !old_options->CellStatistics) && - options->CellStatistics) + options->CellStatistics) { rep_hist_buffer_stats_init(now); + print_notice = 1; + } if ((!old_options || !old_options->DirReqStatistics) && - options->DirReqStatistics) - geoip_dirreq_stats_init(now); + options->DirReqStatistics) { + if (geoip_is_loaded()) { + geoip_dirreq_stats_init(now); + print_notice = 1; + } else { + log_notice(LD_CONFIG, "Configured to measure directory request " + "statistics, but no GeoIP database found! " + "Please specify a GeoIP database using the " + "GeoIPFile option!"); + } + } if ((!old_options || !old_options->EntryStatistics) && - options->EntryStatistics) - geoip_entry_stats_init(now); + options->EntryStatistics && !should_record_bridge_info(options)) { + if (geoip_is_loaded()) { + geoip_entry_stats_init(now); + print_notice = 1; + } else { + log_notice(LD_CONFIG, "Configured to measure entry node " + "statistics, but no GeoIP database found! " + "Please specify a GeoIP database using the " + "GeoIPFile option!"); + } + } if ((!old_options || !old_options->ExitPortStatistics) && - options->ExitPortStatistics) + options->ExitPortStatistics) { rep_hist_exit_stats_init(now); - if (!old_options) + print_notice = 1; + } + if (print_notice) log_notice(LD_CONFIG, "Configured to measure statistics. Look for " "the *-stats files that will first be written to the " "data directory in 24 hours from now.");

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit ca597efb2288996f3fae763f3c01849402ac6514 Merge: 6d027a3 9dfb884 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:46:50 2011 -0400 Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2 changes/dirreq-stats-default | 4 ++ src/or/config.c | 63 +++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 31 deletions(-)

1 0

[tor/maint-0.2.2] Note ticket and source version for feature3951 in changes file
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit f37d24c550a0d8512249f77262c01960af6ed31b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:47:43 2011 -0400 Note ticket and source version for feature3951 in changes file --- changes/dirreq-stats-default | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default index 673be6a..df7ac11 100644 --- a/changes/dirreq-stats-default +++ b/changes/dirreq-stats-default @@ -1,4 +1,5 @@ o Minor features: - Turn on directory request statistics by default and include them in extra-info descriptors. Don't break if we have no GeoIP database. + Backported from 0.2.3.1-alpha; implements ticket 3951.

1 0

[tor/master] Don't update AccountingSoftLimitHitAt on startup
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit d10ae9c02808c10b19bca66cdc1972616b2b6646 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Sep 1 05:21:50 2011 +0200 Don't update AccountingSoftLimitHitAt on startup Add a "default" state which we use until we've decided whether we're live or hibernating. This allows us to properly track whether we're resuming a hibernation period or not. Fixes bug 2003. --- changes/bug2003 | 8 ++++++++ src/or/hibernate.c | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/changes/bug2003 b/changes/bug2003 new file mode 100644 index 0000000..f1298dd --- /dev/null +++ b/changes/bug2003 @@ -0,0 +1,8 @@ + o Major bugfixes: + - Don't update the AccountingSoftLimitHitAt state file entry whenever + tor gets started. This prevents a wrong average bandwidth estimate, + which would cause relays to always start a new accounting interval at + the earliest possible moment. Fixes bug 2003; bugfix on 0.2.2.7-alpha. + Reported by BryonEldridge, who also helped immensely in tracking this + bug down. Thanks! + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index aebce4c..badc96b 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -41,14 +41,17 @@ typedef enum { HIBERNATE_STATE_LOWBANDWIDTH=3, /** We are hibernating, and we won't wake up till there's more bandwidth to * use. */ - HIBERNATE_STATE_DORMANT=4 + HIBERNATE_STATE_DORMANT=4, + /** We start out in state default, which means we havent decided which state + * we're in. */ + HIBERNATE_STATE_INITIAL=5 } hibernate_state_t; extern long stats_n_seconds_working; /* published uptime */ /** Are we currently awake, asleep, running out of bandwidth, or shutting * down? */ -static hibernate_state_t hibernate_state = HIBERNATE_STATE_LIVE; +static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; /** If are hibernating, when do we plan to wake up? Set to 0 if we * aren't hibernating. */ static time_t hibernate_end_time = 0; @@ -804,10 +807,12 @@ static void hibernate_end(hibernate_state_t new_state) { tor_assert(hibernate_state == HIBERNATE_STATE_LOWBANDWIDTH || - hibernate_state == HIBERNATE_STATE_DORMANT); + hibernate_state == HIBERNATE_STATE_DORMANT || + hibernate_state == HIBERNATE_STATE_INITIAL); /* listeners will be relaunched in run_scheduled_events() in main.c */ - log_notice(LD_ACCT,"Hibernation period ended. Resuming normal activity."); + if (hibernate_state != HIBERNATE_STATE_INITIAL) + log_notice(LD_ACCT,"Hibernation period ended. Resuming normal activity."); hibernate_state = new_state; hibernate_end_time = 0; /* no longer hibernating */ @@ -939,7 +944,8 @@ consider_hibernation(time_t now) /* Else, we aren't hibernating. See if it's time to start hibernating, or to * go dormant. */ - if (hibernate_state == HIBERNATE_STATE_LIVE) { + if (hibernate_state == HIBERNATE_STATE_LIVE || + hibernate_state == HIBERNATE_STATE_INITIAL) { if (hibernate_soft_limit_reached()) { log_notice(LD_ACCT, "Bandwidth soft limit reached; commencing hibernation. " @@ -951,6 +957,8 @@ consider_hibernation(time_t now) "Commencing hibernation. We will wake up at %s local time.", buf); hibernate_go_dormant(now); + } else if (hibernate_state == HIBERNATE_STATE_INITIAL) { + hibernate_end(HIBERNATE_STATE_LIVE); } }

1 0

[tor/master] Make the unit tests pass again after the bug2003 fix
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 9bdde8902716bf923a78d8c287acadb0c4d2ffcd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 17:48:21 2011 -0400 Make the unit tests pass again after the bug2003 fix --- src/or/hibernate.c | 28 ++++++++++------------------ src/or/hibernate.h | 22 ++++++++++++++++++++++ src/test/test_dir.c | 6 +++++- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/or/hibernate.c b/src/or/hibernate.c index badc96b..6b1217a 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -21,6 +21,7 @@ hibernating, phase 2: - close all OR/AP/exit conns) */ +#define HIBERNATE_PRIVATE #include "or.h" #include "config.h" #include "connection.h" @@ -29,24 +30,6 @@ hibernating, phase 2: #include "main.h" #include "router.h" -/** Possible values of hibernate_state */ -typedef enum { - /** We are running normally. */ - HIBERNATE_STATE_LIVE=1, - /** We're trying to shut down cleanly, and we'll kill all active connections - * at shutdown_time. */ - HIBERNATE_STATE_EXITING=2, - /** We're running low on allocated bandwidth for this period, so we won't - * accept any new connections. */ - HIBERNATE_STATE_LOWBANDWIDTH=3, - /** We are hibernating, and we won't wake up till there's more bandwidth to - * use. */ - HIBERNATE_STATE_DORMANT=4, - /** We start out in state default, which means we havent decided which state - * we're in. */ - HIBERNATE_STATE_INITIAL=5 -} hibernate_state_t; - extern long stats_n_seconds_working; /* published uptime */ /** Are we currently awake, asleep, running out of bandwidth, or shutting @@ -1025,3 +1008,12 @@ getinfo_helper_accounting(control_connection_t *conn, return 0; } +/** + * Manually change the hibernation state. Private; used only by the unit + * tests. + */ +void +hibernate_set_state_for_testing_(hibernate_state_t newstate) +{ + hibernate_state = newstate; +} diff --git a/src/or/hibernate.h b/src/or/hibernate.h index 2aea0fa..fc5b08f 100644 --- a/src/or/hibernate.h +++ b/src/or/hibernate.h @@ -25,5 +25,27 @@ int getinfo_helper_accounting(control_connection_t *conn, const char *question, char **answer, const char **errmsg); +#ifdef HIBERNATE_PRIVATE +/** Possible values of hibernate_state */ +typedef enum { + /** We are running normally. */ + HIBERNATE_STATE_LIVE=1, + /** We're trying to shut down cleanly, and we'll kill all active connections + * at shutdown_time. */ + HIBERNATE_STATE_EXITING=2, + /** We're running low on allocated bandwidth for this period, so we won't + * accept any new connections. */ + HIBERNATE_STATE_LOWBANDWIDTH=3, + /** We are hibernating, and we won't wake up till there's more bandwidth to + * use. */ + HIBERNATE_STATE_DORMANT=4, + /** We start out in state default, which means we havent decided which state + * we're in. */ + HIBERNATE_STATE_INITIAL=5 +} hibernate_state_t; + +void hibernate_set_state_for_testing_(hibernate_state_t newstate); +#endif + #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 8fd9428..8a0fe9a 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7,10 +7,12 @@ #define DIRSERV_PRIVATE #define DIRVOTE_PRIVATE #define ROUTER_PRIVATE +#define HIBERNATE_PRIVATE #include "or.h" #include "directory.h" #include "dirserv.h" #include "dirvote.h" +#include "hibernate.h" #include "networkstatus.h" #include "router.h" #include "routerlist.h" @@ -85,6 +87,8 @@ test_dir_formats(void) test_assert(pk1 && pk2 && pk3); + hibernate_set_state_for_testing_(HIBERNATE_STATE_LIVE); + get_platform_str(platform, sizeof(platform)); r1 = tor_malloc_zero(sizeof(routerinfo_t)); r1->address = tor_strdup("18.244.0.1"); @@ -1301,7 +1305,7 @@ test_dir_v3_networkstatus(void) } #define DIR_LEGACY(name) \ - { #name, legacy_test_helper, 0, &legacy_setup, test_dir_ ## name } + { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_dir_ ## name } #define DIR(name) \ { #name, test_dir_##name, 0, NULL, NULL }

1 0

[tor/master] Merge remote-tracking branch 'public/bug2003_nm'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 1ec22eac4bf20424624fe2ef2151ff57687912de Merge: 8b0ee60 9bdde89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:43:45 2011 -0400 Merge remote-tracking branch 'public/bug2003_nm' changes/bug2003 | 8 ++++++++ src/or/hibernate.c | 38 +++++++++++++++++++------------------- src/or/hibernate.h | 22 ++++++++++++++++++++++ src/test/test_dir.c | 6 +++++- 4 files changed, 54 insertions(+), 20 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug4018'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit b49fcc6cf2b893fca04eaec8d30bbfe25c04d360 Merge: e8ed465 c1ac069 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 16:32:04 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug4018' changes/dont-warn-about-rfc1918-socksport-addrs | 7 +++++++ src/or/config.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0