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

[tor/release-0.2.2] bridges should use create_fast cells for their own circuits
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit ff8aba7053728d5b8f51152e10d73a7535e495a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:35:27 2011 -0400 bridges should use create_fast cells for their own circuits fixes bug 4124, as noticed in bug 4115 --- changes/bug4124 | 6 ++++++ src/or/circuitbuild.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug4124 b/changes/bug4124 new file mode 100644 index 0000000..abe93cc --- /dev/null +++ b/changes/bug4124 @@ -0,0 +1,6 @@ + o Security fixes: + - Bridges relays now build circuits for themselves in a more similar + way to how clients build them. Removes another avenue for + enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, + when bridges were introduced. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 888023d..c864fd2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1961,9 +1961,10 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ) return 1; /* our hand is forced: only a create_fast will work. */ if (!options->FastFirstHopPK) return 0; /* we prefer to avoid create_fast */ - if (server_mode(options)) { + if (public_server_mode(options)) { /* We're a server, and we know an onion key. We can choose. - * Prefer to blend in. */ + * Prefer to blend our circuit into the other circuits we are + * creating on behalf of others. */ return 0; }

1 0

[tor/release-0.2.2] Turn on directory request statistics by default.
by arma＠torproject.org 24 Oct '11

24 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/release-0.2.2] Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2
by arma＠torproject.org 24 Oct '11

24 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/release-0.2.2] Avoid running DNS self-tests if we're operating as a bridge
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit 6d027a3823843030fc24d7224da3ca976f121b01 Author: warms0x <warms0x(a)riseup.net> Date: Fri Oct 7 07:04:29 2011 +0000 Avoid running DNS self-tests if we're operating as a bridge --- changes/bug4201 | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4201 b/changes/bug4201 new file mode 100644 index 0000000..6f7d715 --- /dev/null +++ b/changes/bug4201 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Bridges now skip DNS self-tests, to act a little more stealthily. + Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced + bridges. Patch by "warms0x". + diff --git a/src/or/main.c b/src/or/main.c index 289d805..95acea4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1241,7 +1241,7 @@ run_scheduled_events(time_t now) /** 9. and if we're a server, check whether our DNS is telling stories to * us. */ - if (is_server && time_to_check_for_correct_dns < now) { + if (public_server_mode(options) && time_to_check_for_correct_dns < now) { if (!time_to_check_for_correct_dns) { time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120); } else {

1 0

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

24 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/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit ac7b6c508dca24a256abc30b4ecaf21019569a38 Merge: 4a351b4 679f617 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 15 16:34:47 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.2] Fix a potentially useless integer overflow check.
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit 1ba90ab655fab036f00ba0185ca7b456612a12bd Author: Mansour Moufid <mansourmoufid(a)gmail.com> Date: Mon Sep 19 21:25:23 2011 -0400 Fix a potentially useless integer overflow check. GCC 4.2 and maybe other compilers optimize away unsigned integer overflow checks of the form (foo + bar < foo), for all bar. Fix one such check in `src/common/OpenBSD_malloc_Linux.c'. --- src/common/OpenBSD_malloc_Linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 19dac77..445135c 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -1236,7 +1236,7 @@ imalloc(size_t size) ptralloc = 1; size = malloc_pagesize; } - if ((size + malloc_pagesize) < size) { /* Check for overflow */ + if (size > SIZE_MAX - malloc_pagesize) { /* Check for overflow */ result = NULL; errno = ENOMEM; } else if (size <= malloc_maxsize)

1 0

[tor/release-0.2.2] changes file for bug 4059
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit bfa75f70bb5eef7b470068df8bf9e3c7fa88c21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 20 09:56:26 2011 -0400 changes file for bug 4059 --- changes/bug4059 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug4059 b/changes/bug4059 new file mode 100644 index 0000000..82a4b1a --- /dev/null +++ b/changes/bug4059 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Change an integer overflow check in the OpenBSD_Malloc code so + that GCC is less likely to eliminate it as impossible. Patch + from Mansour Moufid. Fixes bug 4059. +

1 0

[tor/release-0.2.2] Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit 5835acc6f910e2bb1e3908802717eeff4122a9b8 Author: Tom Lowenthal <me(a)tomlowenthal.com> Date: Sat Sep 24 15:34:32 2011 -0700 Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO --- src/or/circuitbuild.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c6be46d..888023d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1381,7 +1381,7 @@ circuit_build_times_set_timeout_worker(circuit_build_times_t *cbt) cbt->close_ms = MAX(cbt->close_ms, circuit_build_times_initial_timeout()); if (cbt->timeout_ms > max_time) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Circuit build timeout of %dms is beyond the maximum build " "time we have ever observed. Capping it to %dms.", (int)cbt->timeout_ms, max_time); @@ -1429,7 +1429,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) timeout_rate = circuit_build_times_timeout_rate(cbt); if (prev_timeout > tor_lround(cbt->timeout_ms/1000)) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Based on %d circuit times, it looks like we don't need to " "wait so long for circuits to finish. We will now assume a " "circuit is too slow to use after waiting %ld seconds.", @@ -1440,7 +1440,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha, timeout_rate); } else if (prev_timeout < tor_lround(cbt->timeout_ms/1000)) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Based on %d circuit times, it looks like we need to wait " "longer for circuits to finish. We will now assume a " "circuit is too slow to use after waiting %ld seconds.",

1 0

[tor/release-0.2.2] Add a changes file for Tom Lowenthal's patch for #4063
by arma＠torproject.org 24 Oct '11

24 Oct '11

commit ccceefe13674119768436bd1b9e3c4bf04ffc5ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 24 22:15:13 2011 -0400 Add a changes file for Tom Lowenthal's patch for #4063 --- changes/ticket-4063 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/ticket-4063 b/changes/ticket-4063 new file mode 100644 index 0000000..6a985b8 --- /dev/null +++ b/changes/ticket-4063 @@ -0,0 +1,6 @@ + o Minor bugfixes (usability): + - Downgrade log messages about circuit timeout calibration from + "notice" to "info": they don't require or suggest any human + intervention. Patch from Tom Lowenthal. Fixes bug 4063; + bugfix on 0.2.2.14-alpha. +

1 0