tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 09 Dec '17

09 Dec '17

commit f89025a2edb93b9f6bba6b3015033d7a9e9beef0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 9 16:46:16 2017 +0000 Update translations for torbirdy --- ga/torbirdy.dtd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ga/torbirdy.dtd b/ga/torbirdy.dtd index 4f864f575..788278b7f 100644 --- a/ga/torbirdy.dtd +++ b/ga/torbirdy.dtd @@ -38,10 +38,8 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ná cuir aitheantais eochracha na bhfaighteoirí i dteachtaireachtaí criptithe [réamhshocrú: cuir]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> -<!ENTITY torbirdy.prefs.enigmail_protected.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> -<!ENTITY torbirdy.prefs.enigmail_protected.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Díchumasaigh ceanntásca criptithe ríomhphoist [réamhshocrú: cumasaithe]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Deimhnigh sula seolann tú ríomhphost má tá Enigmail cumasaithe [réamhshocrú: ná deimhnigh]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Cumasaigh an treoraí cumraíochta rphoist in Thunderbird [réamhshocrú: díchumasaithe]">

1 0

[webwml/master] Add new Tor Browser version: 7.5a9
by boklm＠torproject.org 09 Dec '17

09 Dec '17

commit e4638cf4742afe6ae00626bee0e366c3d8323529 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Dec 9 17:04:05 2017 +0100 Add new Tor Browser version: 7.5a9 --- include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 9b812dd3..5734c1c4 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -22,9 +22,9 @@ <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha *** -<define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a8</define-tag> -<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-11-16</define-tag> -<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.15</define-tag> +<define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a9</define-tag> +<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-12-09</define-tag> +<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.16</define-tag> # If all platforms are on the same version, you only need to update # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 0b297a10..34b9545e 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -10,5 +10,9 @@ "7.5a8", "7.5a8-MacOS", "7.5a8-Linux", -"7.5a8-Windows" +"7.5a8-Windows", +"7.5a9", +"7.5a9-MacOS", +"7.5a9-Linux", +"7.5a9-Windows" ]

1 0

[webwml/master] Add new Tor Browser version: 7.0.11
by boklm＠torproject.org 09 Dec '17

09 Dec '17

commit e50fb2e5974b97fa03f0f2094c7b179fb4d592a3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Dec 9 16:19:17 2017 +0100 Add new Tor Browser version: 7.0.11 --- include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index f7073ca7..b0471460 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,8 +4,8 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag> # *** tor browser stable *** -<define-tag version-torbrowserbundle-all whitespace=delete>7.0.10</define-tag> -<define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-11-14</define-tag> +<define-tag version-torbrowserbundle-all whitespace=delete>7.0.11</define-tag> +<define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-12-09</define-tag> # If all platforms are on the same version, you only to update # version-torbrowserbundle-all and releasedate-torbrowserbundle-all @@ -18,7 +18,7 @@ <let version-torbrowserbundleosx64=version-torbrowserbundle-all /> <let releasedate-torbrowserbundleosx64=releasedate-torbrowserbundle-all /> -<define-tag version-win32-stable whitespace=delete>0.3.1.8</define-tag> +<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha *** diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index f251c2cc..0b297a10 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "7.0.10-MacOS", "7.0.10-Linux", "7.0.10-Windows", +"7.0.11", +"7.0.11-MacOS", +"7.0.11-Linux", +"7.0.11-Windows", "7.5a8", "7.5a8-MacOS", "7.5a8-Linux",

1 0

[webwml/master] Move version-win32-stable closer to version-torbrowserbundle-all
by boklm＠torproject.org 09 Dec '17

09 Dec '17

commit e23dad8b56ce5f6b8574967ff505f52596703512 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Dec 9 16:22:36 2017 +0100 Move version-win32-stable closer to version-torbrowserbundle-all --- include/versions.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/versions.wmi b/include/versions.wmi index b0471460..4b256bf5 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -6,6 +6,7 @@ # *** tor browser stable *** <define-tag version-torbrowserbundle-all whitespace=delete>7.0.11</define-tag> <define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-12-09</define-tag> +<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag> # If all platforms are on the same version, you only to update # version-torbrowserbundle-all and releasedate-torbrowserbundle-all @@ -18,7 +19,6 @@ <let version-torbrowserbundleosx64=version-torbrowserbundle-all /> <let releasedate-torbrowserbundleosx64=releasedate-torbrowserbundle-all /> -<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha ***

1 0

[webwml/master] Move version-torbrowsersandboxlinux closer to version-torbrowserbundlebeta-all
by boklm＠torproject.org 09 Dec '17

09 Dec '17

commit 13a3006ca2f24c207088573224ba8ab188ae7b97 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Dec 9 16:23:02 2017 +0100 Move version-torbrowsersandboxlinux closer to version-torbrowserbundlebeta-all --- include/versions.wmi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 4b256bf5..9b812dd3 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -24,6 +24,7 @@ # *** tor browser beta/alpha *** <define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a8</define-tag> <define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-11-16</define-tag> +<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.15</define-tag> # If all platforms are on the same version, you only need to update # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all @@ -38,8 +39,6 @@ <let version-torbrowserbundleosx64beta=version-torbrowserbundlebeta-all /> <let releasedate-torbrowserbundleosx64beta=releasedate-torbrowserbundlebeta-all /> -<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.15</define-tag> - <define-tag file-source-stable whitespace=delete>tor-<version-stable>.tar.gz</define-tag> <define-tag package-source-stable whitespace=delete>../dist/<file-source-stable></define-tag>

1 0

[tor/master] Add tests for circuitstats.c
by nickm＠torproject.org 09 Dec '17

09 Dec '17

commit 050bb67974c11e0f390f4b1fa1b067c86538c59e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 20 20:24:59 2017 +0000 Add tests for circuitstats.c These tests primarily test the relaxed and measured behavior of circuitstats.c, to make sure we did not break it with #23100 or #23114. --- src/or/circuitbuild.c | 4 +- src/or/circuituse.c | 6 +- src/test/Makefile.nmake | 1 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_circuitstats.c | 199 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 209 insertions(+), 4 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0be54c533..b56190fee 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -75,7 +75,7 @@ static int onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit, int is_hs_v3_rp_circuit); static crypt_path_t *onion_next_hop_in_cpath(crypt_path_t *cpath); static int onion_extend_cpath(origin_circuit_t *circ); -static int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); +STATIC int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); static int circuit_send_first_onion_skin(origin_circuit_t *circ); static int circuit_build_no_more_hops(origin_circuit_t *circ); static int circuit_send_intermediate_onion_skin(origin_circuit_t *circ, @@ -2586,7 +2586,7 @@ onion_extend_cpath(origin_circuit_t *circ) /** Create a new hop, annotate it with information about its * corresponding router <b>choice</b>, and append it to the * end of the cpath <b>head_ptr</b>. */ -static int +STATIC int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice) { crypt_path_t *hop = tor_malloc_zero(sizeof(crypt_path_t)); diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 1335e12c6..d4657921e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -585,7 +585,8 @@ circuit_expire_building(void) TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : -1, circuit_state_to_string(victim->state), - channel_state_to_string(victim->n_chan->state)); + victim->n_chan ? + channel_state_to_string(victim->n_chan->state) : "none"); /* We count the timeout here for CBT, because technically this * was a timeout, and the timeout value needs to reset if we @@ -610,7 +611,8 @@ circuit_expire_building(void) TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : -1, circuit_state_to_string(victim->state), - channel_state_to_string(victim->n_chan->state), + victim->n_chan ? + channel_state_to_string(victim->n_chan->state) : "none", (long)build_close_ms); } } diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index 605f1a92c..cfbe281b9 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -18,6 +18,7 @@ TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_channeltls.obj \ test_config.obj test_connection.obj \ test_cell_formats.obj test_relay.obj test_replay.obj \ test_channelpadding.obj \ + test_circuitstats.obj \ test_scheduler.obj test_introduce.obj test_hs.obj tinytest.obj tinytest.obj: ..\ext\tinytest.c diff --git a/src/test/include.am b/src/test/include.am index bbf8a370e..b3a99503d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -98,6 +98,7 @@ src_test_test_SOURCES = \ src/test/test_circuitmux.c \ src/test/test_circuitbuild.c \ src/test/test_circuituse.c \ + src/test/test_circuitstats.c \ src/test/test_compat_libevent.c \ src/test/test_config.c \ src/test/test_connection.c \ diff --git a/src/test/test.c b/src/test/test.c index 00857c238..bf591e176 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1178,6 +1178,7 @@ struct testgroup_t testgroups[] = { { "circuitlist/", circuitlist_tests }, { "circuitmux/", circuitmux_tests }, { "circuituse/", circuituse_tests }, + { "circuitstats/", circuitstats_tests }, { "compat/libevent/", compat_libevent_tests }, { "config/", config_tests }, { "connection/", connection_tests }, diff --git a/src/test/test.h b/src/test/test.h index b1a3366a8..792ef6a06 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -188,6 +188,7 @@ extern struct testcase_t circuitbuild_tests[]; extern struct testcase_t circuitlist_tests[]; extern struct testcase_t circuitmux_tests[]; extern struct testcase_t circuituse_tests[]; +extern struct testcase_t circuitstats_tests[]; extern struct testcase_t compat_libevent_tests[]; extern struct testcase_t config_tests[]; extern struct testcase_t connection_tests[]; diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c new file mode 100644 index 000000000..1c6a2ba28 --- /dev/null +++ b/src/test/test_circuitstats.c @@ -0,0 +1,199 @@ +/* Copyright (c) 2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define CIRCUITBUILD_PRIVATE +#define CIRCUITSTATS_PRIVATE +#define CHANNEL_PRIVATE_ + +#include "or.h" +#include "test.h" +#include "test_helpers.h" +#include "log_test_helpers.h" +#include "config.h" +#include "circuitlist.h" +#include "circuitbuild.h" +#include "circuitstats.h" +#include "circuituse.h" +#include "channel.h" + +void test_circuitstats_timeout(void *arg); +void test_circuitstats_hoplen(void *arg); +origin_circuit_t *subtest_fourhop_circuit(struct timeval, int); +origin_circuit_t *add_opened_threehop(void); +origin_circuit_t *build_unopened_fourhop(struct timeval); + +void circuit_free(circuit_t *circ); +int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); + +static int marked_for_close; +/* Mock function because we are not trying to test the close circuit that does + * an awful lot of checks on the circuit object. */ +static void +mock_circuit_mark_for_close(circuit_t *circ, int reason, int line, + const char *file) +{ + (void) circ; + (void) reason; + (void) line; + (void) file; + marked_for_close = 1; + return; +} + +origin_circuit_t * +add_opened_threehop(void) +{ + origin_circuit_t *or_circ = origin_circuit_new(); + extend_info_t fakehop; + memset(&fakehop, 0, sizeof(fakehop)); + + TO_CIRCUIT(or_circ)->purpose = CIRCUIT_PURPOSE_C_GENERAL; + + or_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t)); + or_circ->build_state->desired_path_len = DEFAULT_ROUTE_LEN; + + onion_append_hop(&or_circ->cpath, &fakehop); + onion_append_hop(&or_circ->cpath, &fakehop); + onion_append_hop(&or_circ->cpath, &fakehop); + + or_circ->has_opened = 1; + TO_CIRCUIT(or_circ)->state = CIRCUIT_STATE_OPEN; + TO_CIRCUIT(or_circ)->purpose = CIRCUIT_PURPOSE_C_GENERAL; + + return or_circ; +} + +origin_circuit_t * +build_unopened_fourhop(struct timeval circ_start_time) +{ + origin_circuit_t *or_circ = origin_circuit_new(); + extend_info_t *fakehop = tor_malloc_zero(sizeof(extend_info_t)); + memset(fakehop, 0, sizeof(extend_info_t)); + + TO_CIRCUIT(or_circ)->purpose = CIRCUIT_PURPOSE_C_GENERAL; + TO_CIRCUIT(or_circ)->timestamp_began = circ_start_time; + TO_CIRCUIT(or_circ)->timestamp_created = circ_start_time; + + or_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t)); + or_circ->build_state->desired_path_len = 4; + + onion_append_hop(&or_circ->cpath, fakehop); + onion_append_hop(&or_circ->cpath, fakehop); + onion_append_hop(&or_circ->cpath, fakehop); + onion_append_hop(&or_circ->cpath, fakehop); + + return or_circ; +} + +origin_circuit_t * +subtest_fourhop_circuit(struct timeval circ_start_time, int should_timeout) +{ + origin_circuit_t *or_circ = build_unopened_fourhop(circ_start_time); + + // Now make them open one at a time and call + // circuit_build_times_handle_completed_hop(); + or_circ->cpath->state = CPATH_STATE_OPEN; + circuit_build_times_handle_completed_hop(or_circ); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 0); + + or_circ->cpath->next->state = CPATH_STATE_OPEN; + circuit_build_times_handle_completed_hop(or_circ); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 0); + + // Third hop: We should count it now. + or_circ->cpath->next->next->state = CPATH_STATE_OPEN; + circuit_build_times_handle_completed_hop(or_circ); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, + !should_timeout); // 1 if counted, 0 otherwise + + // Fourth hop: Don't double count + or_circ->cpath->next->next->next->state = CPATH_STATE_OPEN; + circuit_build_times_handle_completed_hop(or_circ); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, + !should_timeout); + + done: + return or_circ; +} + +void +test_circuitstats_hoplen(void *arg) +{ + /* Plan: + * 0. Test no other opened circs (relaxed timeout) + * 1. Check >3 hop circ building w/o timeout + * 2. Check >3 hop circs w/ timeouts.. + */ + struct timeval circ_start_time; + origin_circuit_t *threehop = NULL; + origin_circuit_t *fourhop = NULL; + (void)arg; + MOCK(circuit_mark_for_close_, mock_circuit_mark_for_close); + + circuit_build_times_init(get_circuit_build_times_mutable()); + + // Let's set a close_ms to 2X the initial timeout, so we can + // test relaxed functionality (which uses the close_ms timeout) + get_circuit_build_times_mutable()->close_ms *= 2; + + tor_gettimeofday(&circ_start_time); + circ_start_time.tv_sec -= 119; // make us hit "relaxed" cutoff + + // Test 1: Build a fourhop circuit that should get marked + // as relaxed and eventually counted by circuit_expire_building + // (but not before) + fourhop = subtest_fourhop_circuit(circ_start_time, 0); + tt_int_op(fourhop->relaxed_timeout, OP_EQ, 0); + tt_int_op(marked_for_close, OP_EQ, 0); + circuit_expire_building(); + tt_int_op(marked_for_close, OP_EQ, 0); + tt_int_op(fourhop->relaxed_timeout, OP_EQ, 1); + TO_CIRCUIT(fourhop)->timestamp_began.tv_sec -= 119; + circuit_expire_building(); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 1); + tt_int_op(marked_for_close, OP_EQ, 1); + + circuit_free(TO_CIRCUIT(fourhop)); + circuit_build_times_reset(get_circuit_build_times_mutable()); + + // Test 2: Add a threehop circuit for non-relaxed timeouts + threehop = add_opened_threehop(); + + /* This circuit should not timeout */ + tor_gettimeofday(&circ_start_time); + circ_start_time.tv_sec -= 59; + fourhop = subtest_fourhop_circuit(circ_start_time, 0); + circuit_expire_building(); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 1); + tt_int_op(TO_CIRCUIT(fourhop)->purpose, OP_NE, + CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); + + circuit_free((circuit_t *)fourhop); + circuit_build_times_reset(get_circuit_build_times_mutable()); + + /* Test 3: This circuit should now time out and get marked as a + * measurement circuit, but still get counted (and counted only once) + */ + circ_start_time.tv_sec -= 2; + fourhop = subtest_fourhop_circuit(circ_start_time, 0); + tt_int_op(TO_CIRCUIT(fourhop)->purpose, OP_EQ, + CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 1); + circuit_expire_building(); + tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 1); + + done: + UNMOCK(circuit_mark_for_close_); + circuit_free(TO_CIRCUIT(threehop)); + circuit_free(TO_CIRCUIT(fourhop)); + circuit_build_times_free_timeouts(get_circuit_build_times_mutable()); +} + +#define TEST_CIRCUITSTATS(name, flags) \ + { #name, test_##name, (flags), NULL, NULL } + +struct testcase_t circuitstats_tests[] = { + TEST_CIRCUITSTATS(circuitstats_hoplen, TT_FORK), + END_OF_TESTCASES +}; +

1 0

[tor/master] Report close and timeout rates since uptime, not based on data.
by nickm＠torproject.org 09 Dec '17

09 Dec '17

commit 125df07d609933a7974f362706b126a4bf339788 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 6 23:56:03 2017 +0000 Report close and timeout rates since uptime, not based on data. Bug #23114 was harder to see because we were just reporting our math, rather than reporting behavior. --- src/or/circuitstats.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/circuitstats.h | 10 ++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 0620e045d..afb37771f 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -45,6 +45,7 @@ static void cbt_control_event_buildtimeout_set( const circuit_build_times_t *cbt, buildtimeout_set_event_t type); +static void circuit_build_times_scale_circ_counts(circuit_build_times_t *cbt); #define CBT_BIN_TO_MS(bin) ((bin)*CBT_BIN_WIDTH + (CBT_BIN_WIDTH/2)) @@ -537,6 +538,11 @@ circuit_build_times_reset(circuit_build_times_t *cbt) cbt->total_build_times = 0; cbt->build_times_idx = 0; cbt->have_computed_timeout = 0; + + // Reset timeout and close counts + cbt->num_circ_succeeded = 0; + cbt->num_circ_closed = 0; + cbt->num_circ_timeouts = 0; } /** @@ -1404,6 +1410,24 @@ circuit_build_times_network_is_live(circuit_build_times_t *cbt) } /** + * Non-destructively scale all of our circuit success, timeout, and close + * counts down by a factor of two. Scaling in this way preserves the + * ratios between succeeded vs timed out vs closed circuits, so that + * our statistics don't change when we scale. + * + * This is used only in the rare event that we build more than + * INT32_MAX circuits. Since the num_circ_* variables are + * uint32_t, we won't even be close to overflowing them. + */ +void +circuit_build_times_scale_circ_counts(circuit_build_times_t *cbt) +{ + cbt->num_circ_succeeded /= 2; + cbt->num_circ_timeouts /= 2; + cbt->num_circ_closed /= 2; +} + +/** * Called to indicate that we "completed" a circuit. Because this circuit * succeeded, it doesn't count as a timeout-after-the-first-hop. * @@ -1419,6 +1443,14 @@ circuit_build_times_network_is_live(circuit_build_times_t *cbt) void circuit_build_times_network_circ_success(circuit_build_times_t *cbt) { + // Count circuit success + cbt->num_circ_succeeded++; + + // If we're going to wrap int32, scale everything + if (cbt->num_circ_succeeded >= INT32_MAX) { + circuit_build_times_scale_circ_counts(cbt); + } + /* Check for NULLness because we might not be using adaptive timeouts */ if (cbt->liveness.timeouts_after_firsthop && cbt->liveness.num_recent_circs > 0) { @@ -1441,6 +1473,14 @@ static void circuit_build_times_network_timeout(circuit_build_times_t *cbt, int did_onehop) { + // Count circuit timeout + cbt->num_circ_timeouts++; + + // If we're going to wrap int32, scale everything + if (cbt->num_circ_timeouts >= INT32_MAX) { + circuit_build_times_scale_circ_counts(cbt); + } + /* Check for NULLness because we might not be using adaptive timeouts */ if (cbt->liveness.timeouts_after_firsthop && cbt->liveness.num_recent_circs > 0) { @@ -1466,6 +1506,15 @@ circuit_build_times_network_close(circuit_build_times_t *cbt, int did_onehop, time_t start_time) { time_t now = time(NULL); + + // Count circuit close + cbt->num_circ_closed++; + + // If we're going to wrap int32, scale everything + if (cbt->num_circ_closed >= INT32_MAX) { + circuit_build_times_scale_circ_counts(cbt); + } + /* * Check if this is a timeout that was for a circuit that spent its * entire existence during a time where we have had no network activity. @@ -1820,6 +1869,8 @@ cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, { char *args = NULL; double qnt; + double timeout_rate = 0.0; + double close_rate = 0.0; switch (type) { case BUILDTIMEOUT_SET_EVENT_RESET: @@ -1834,15 +1885,29 @@ cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, break; } + /* The timeout rate is the ratio of the timeout count over + * the total number of circuits attempted. The total number of + * circuits is (timeouts+succeeded+closed), since a circuit can + * either timeout, close, or succeed. We cast the denominator + * to promote it to double before the addition, to avoid int32 + * overflow. */ + const double total_circuits = + ((double)cbt->num_circ_timeouts) + cbt->num_circ_succeeded + + cbt->num_circ_closed; + if (total_circuits >= 1.0) { + timeout_rate = cbt->num_circ_timeouts / total_circuits; + close_rate = cbt->num_circ_closed / total_circuits; + } + tor_asprintf(&args, "TOTAL_TIMES=%lu " "TIMEOUT_MS=%lu XM=%lu ALPHA=%f CUTOFF_QUANTILE=%f " "TIMEOUT_RATE=%f CLOSE_MS=%lu CLOSE_RATE=%f", (unsigned long)cbt->total_build_times, (unsigned long)cbt->timeout_ms, (unsigned long)cbt->Xm, cbt->alpha, qnt, - circuit_build_times_timeout_rate(cbt), + timeout_rate, (unsigned long)cbt->close_ms, - circuit_build_times_close_rate(cbt)); + close_rate); control_event_buildtimeout_set(type, args); diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 7fc65fc8d..86116cb7f 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -96,6 +96,16 @@ struct circuit_build_times_s { double timeout_ms; /** How long we wait before actually closing the circuit. */ double close_ms; + /** Total succeeded counts. Old measurements may be scaled downward if + * we've seen a lot of circuits. */ + uint32_t num_circ_succeeded; + /** Total timeout counts. Old measurements may be scaled downward if + * we've seen a lot of circuits. */ + uint32_t num_circ_timeouts; + /** Total closed counts. Old measurements may be scaled downward if + * we've seen a lot of circuits.*/ + uint32_t num_circ_closed; + }; #endif /* defined(CIRCUITSTATS_PRIVATE) */

1 0

[tor/master] Bug #23114: Time out circuits immediately.
by nickm＠torproject.org 09 Dec '17

09 Dec '17

commit ed89588c4fa672eb8a85c8c5cdce4f7ec08bc9d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Dec 7 00:04:09 2017 +0000 Bug #23114: Time out circuits immediately. This changes the purpose of circuits that are past the timeout to measurement *as they are built*, ensuring accurate application of the timeout logic. --- changes/bug23114 | 6 ++++++ src/or/circuitlist.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/circuitlist.h | 6 +++++- src/or/circuitstats.c | 55 ++++++++++++++++++++++++++++++++++++++++++---- src/or/circuitstats.h | 1 + src/or/circuituse.c | 53 ++++++++++++++++++++------------------------- 6 files changed, 145 insertions(+), 36 deletions(-) diff --git a/changes/bug23114 b/changes/bug23114 new file mode 100644 index 000000000..b67f75a5a --- /dev/null +++ b/changes/bug23114 @@ -0,0 +1,6 @@ + o Minor bugfixes (Performance): + - Consider circuits for timeout as soon as they complete a hop. This + is more accurate than applying the timeout in circuit_expire_building() + because that function is only called once per second, which is now + too slow for typical timeouts on the current network. Fixes bug 23114; + bugfix on 0.2.2.2-alpha. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 20fa03306..fbf10fc0a 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -109,6 +109,14 @@ static void cpath_ref_decref(crypt_path_reference_t *cpath_ref); static void circuit_about_to_free_atexit(circuit_t *circ); static void circuit_about_to_free(circuit_t *circ); +/** + * A cached value of the current state of the origin circuit list. Has the + * value 1 if we saw any opened circuits recently (since the last call to + * circuit_any_opened_circuits(), which gets called around once a second by + * circuit_expire_building). 0 otherwise. + */ +static int any_opened_circs_cached_val = 0; + /********* END VARIABLES ************/ /** A map from channel and circuit ID to circuit. (Lookup performance is @@ -597,6 +605,56 @@ circuit_get_global_origin_circuit_list(void) return global_origin_circuit_list; } +/** + * Return true if we have any opened general-purpose 3 hop + * origin circuits. + * + * The result from this function is cached for use by + * circuit_any_opened_circuits_cached(). + */ +int +circuit_any_opened_circuits(void) +{ + SMARTLIST_FOREACH_BEGIN(circuit_get_global_origin_circuit_list(), + const origin_circuit_t *, next_circ) { + if (!TO_CIRCUIT(next_circ)->marked_for_close && + next_circ->has_opened && + TO_CIRCUIT(next_circ)->state == CIRCUIT_STATE_OPEN && + TO_CIRCUIT(next_circ)->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT && + next_circ->build_state && + next_circ->build_state->desired_path_len == DEFAULT_ROUTE_LEN) { + circuit_cache_opened_circuit_state(1); + return 1; + } + } SMARTLIST_FOREACH_END(next_circ); + + circuit_cache_opened_circuit_state(0); + return 0; +} + +/** + * Cache the "any circuits opened" state, as specified in param + * circuits_are_opened. This is a helper function to update + * the circuit opened status whenever we happen to look at the + * circuit list. + */ +void +circuit_cache_opened_circuit_state(int circuits_are_opened) +{ + any_opened_circs_cached_val = circuits_are_opened; +} + +/** + * Return true if there were any opened circuits since the last call to + * circuit_any_opened_circuits(), or since circuit_expire_building() last + * ran (it runs roughly once per second). + */ +int +circuit_any_opened_circuits_cached(void) +{ + return any_opened_circs_cached_val; +} + /** Function to make circ-\>state human-readable */ const char * circuit_state_to_string(int state) @@ -1792,7 +1850,7 @@ circuit_get_cpath_len(origin_circuit_t *circ) /** Return the number of opened hops in circuit's path. * If circ has no entries, or is NULL, returns 0. */ int -circuit_get_cpath_opened_len(origin_circuit_t *circ) +circuit_get_cpath_opened_len(const origin_circuit_t *circ) { int n = 0; if (circ && circ->cpath) { diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index c90f5445d..6371e913a 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -17,6 +17,10 @@ MOCK_DECL(smartlist_t *, circuit_get_global_list, (void)); smartlist_t *circuit_get_global_origin_circuit_list(void); +int circuit_any_opened_circuits(void); +int circuit_any_opened_circuits_cached(void); +void circuit_cache_opened_circuit_state(int circuits_are_opened); + const char *circuit_state_to_string(int state); const char *circuit_purpose_to_controller_string(uint8_t purpose); const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose); @@ -58,7 +62,7 @@ void circuit_mark_all_dirty_circs_as_unusable(void); MOCK_DECL(void, circuit_mark_for_close_, (circuit_t *circ, int reason, int line, const char *file)); int circuit_get_cpath_len(origin_circuit_t *circ); -int circuit_get_cpath_opened_len(origin_circuit_t *); +int circuit_get_cpath_opened_len(const origin_circuit_t *); void circuit_clear_cpath(origin_circuit_t *circ); crypt_path_t *circuit_get_cpath_hop(origin_circuit_t *circ, int hopnum); void circuit_get_all_pending_on_channel(smartlist_t *out, diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 5cb90c500..0620e045d 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -37,6 +37,7 @@ #include "rendservice.h" #include "statefile.h" #include "circuitlist.h" +#include "circuituse.h" #undef log #include <math.h> @@ -612,6 +613,35 @@ circuit_build_times_rewind_history(circuit_build_times_t *cbt, int n) #endif /* 0 */ /** + * Mark this circuit as timed out, but change its purpose + * so that it continues to build, allowing us to measure + * its full build time. + */ +void +circuit_build_times_mark_circ_as_measurement_only(origin_circuit_t *circ) +{ + control_event_circuit_status(circ, + CIRC_EVENT_FAILED, + END_CIRC_REASON_TIMEOUT); + circuit_change_purpose(TO_CIRCUIT(circ), + CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); + /* Record this event to check for too many timeouts + * in a row. This function does not record a time value yet + * (we do that later); it only counts the fact that we did + * have a timeout. We also want to avoid double-counting + * already "relaxed" circuits, which are counted in + * circuit_expire_building(). */ + if (!circ->relaxed_timeout) { + int first_hop_succeeded = circ->cpath && + circ->cpath->state == CPATH_STATE_OPEN; + + circuit_build_times_count_timeout( + get_circuit_build_times_mutable(), + first_hop_succeeded); + } +} + +/** * Perform the build time work that needs to be done when a circuit * completes a hop. * @@ -649,12 +679,29 @@ circuit_build_times_handle_completed_hop(origin_circuit_t *circ) return; } + tor_gettimeofday(&end); + timediff = tv_mdiff(&circ->base_.timestamp_began, &end); + + /* Check if we would have timed out already. If so, change the + * purpose here. But don't do any timeout handling here if there + * are no circuits opened yet. Save it for circuit_expire_building() + * (to allow it to handle timeout "relaxing" over there). */ + if (timediff > get_circuit_build_timeout_ms() && + circuit_any_opened_circuits_cached()) { + + /* Circuits are allowed to last longer for measurement. + * Switch their purpose and wait. */ + if (circ->base_.purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) { + log_info(LD_CIRC, + "Deciding to timeout circuit "U64_FORMAT"\n", + U64_PRINTF_ARG(circ->global_identifier)); + circuit_build_times_mark_circ_as_measurement_only(circ); + } + } + /* If the circuit is built to exactly the DEFAULT_ROUTE_LEN, * add it to our buildtimes. */ if (circuit_get_cpath_opened_len(circ) == DEFAULT_ROUTE_LEN) { - tor_gettimeofday(&end); - timediff = tv_mdiff(&circ->base_.timestamp_began, &end); - /* If the circuit build time is much greater than we would have cut * it off at, we probably had a suspend event along this codepath, * and we should discard the value. @@ -668,7 +715,7 @@ circuit_build_times_handle_completed_hop(origin_circuit_t *circ) } else { /* Only count circuit times if the network is live */ if (circuit_build_times_network_check_live( - get_circuit_build_times())) { + get_circuit_build_times())) { circuit_build_times_add_time(get_circuit_build_times_mutable(), (build_time_t)timediff); circuit_build_times_set_timeout(get_circuit_build_times_mutable()); diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 68b66af1b..7fc65fc8d 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -45,6 +45,7 @@ double circuit_build_times_timeout_rate(const circuit_build_times_t *cbt); double circuit_build_times_close_rate(const circuit_build_times_t *cbt); void circuit_build_times_update_last_circ(circuit_build_times_t *cbt); +void circuit_build_times_mark_circ_as_measurement_only(origin_circuit_t *circ); #ifdef CIRCUITSTATS_PRIVATE STATIC double circuit_build_times_calculate_timeout(circuit_build_times_t *cbt, diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 62cc865f4..1335e12c6 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -412,8 +412,17 @@ circuit_conforms_to_options(const origin_circuit_t *circ, } #endif /* 0 */ -/** Close all circuits that start at us, aren't open, and were born +/** + * Close all circuits that start at us, aren't open, and were born * at least CircuitBuildTimeout seconds ago. + * + * TODO: This function is now partially redundant to + * circuit_build_times_handle_completed_hop(), but that function only + * covers circuits up to and including 3 hops that are still actually + * completing hops. However, circuit_expire_building() also handles longer + * circuits, as well as circuits that are completely stalled. + * In the future (after prop247/other path selection revamping), we probably + * want to eliminate this rats nest in favor of a simpler approach. */ void circuit_expire_building(void) @@ -435,21 +444,7 @@ circuit_expire_building(void) * we want to be more lenient with timeouts, in case the * user has relocated and/or changed network connections. * See bug #3443. */ - SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, next_circ) { - if (!CIRCUIT_IS_ORIGIN(next_circ) || /* didn't originate here */ - next_circ->marked_for_close) { /* don't mess with marked circs */ - continue; - } - - if (TO_ORIGIN_CIRCUIT(next_circ)->has_opened && - next_circ->state == CIRCUIT_STATE_OPEN && - TO_ORIGIN_CIRCUIT(next_circ)->build_state && - TO_ORIGIN_CIRCUIT(next_circ)->build_state->desired_path_len - == DEFAULT_ROUTE_LEN) { - any_opened_circs = 1; - break; - } - } SMARTLIST_FOREACH_END(next_circ); + any_opened_circs = circuit_any_opened_circuits(); #define SET_CUTOFF(target, msec) do { \ long ms = tor_lround(msec); \ @@ -493,6 +488,10 @@ circuit_expire_building(void) SET_CUTOFF(general_cutoff, get_circuit_build_timeout_ms()); SET_CUTOFF(begindir_cutoff, get_circuit_build_timeout_ms()); + // TODO: We should probably use route_len_for_purpose() here instead, + // except that does not count the extra round trip for things like server + // intros and rends. + /* > 3hop circs seem to have a 1.0 second delay on their cannibalized * 4th hop. */ SET_CUTOFF(fourhop_cutoff, get_circuit_build_timeout_ms() * (10/6.0) + 1000); @@ -694,23 +693,17 @@ circuit_expire_building(void) if (circuit_timeout_want_to_count_circ(TO_ORIGIN_CIRCUIT(victim)) && circuit_build_times_enough_to_compute(get_circuit_build_times())) { + + log_info(LD_CIRC, + "Deciding to count the timeout for circuit "U64_FORMAT"\n", + U64_PRINTF_ARG( + TO_ORIGIN_CIRCUIT(victim)->global_identifier)); + /* Circuits are allowed to last longer for measurement. * Switch their purpose and wait. */ if (victim->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) { - control_event_circuit_status(TO_ORIGIN_CIRCUIT(victim), - CIRC_EVENT_FAILED, - END_CIRC_REASON_TIMEOUT); - circuit_change_purpose(victim, CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); - /* Record this failure to check for too many timeouts - * in a row. This function does not record a time value yet - * (we do that later); it only counts the fact that we did - * have a timeout. We also want to avoid double-counting - * already "relaxed" circuits, which are counted above. */ - if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) { - circuit_build_times_count_timeout( - get_circuit_build_times_mutable(), - first_hop_succeeded); - } + circuit_build_times_mark_circ_as_measurement_only(TO_ORIGIN_CIRCUIT( + victim)); continue; }

1 0

[tor/master] Merge remote-tracking branch 'mikeperry/bug23114_squashed2'
by nickm＠torproject.org 09 Dec '17

09 Dec '17

commit 0340c02975a51410525507b92ee0b7f9e6e9d6f7 Merge: b189c613b 050bb6797 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 8 17:50:34 2017 -0500 Merge remote-tracking branch 'mikeperry/bug23114_squashed2' changes/bug23100 | 7 ++ changes/bug23114 | 6 ++ src/or/circuitbuild.c | 59 +++++-------- src/or/circuitbuild.h | 2 +- src/or/circuitlist.c | 77 +++++++++++++++++ src/or/circuitlist.h | 5 ++ src/or/circuitstats.c | 195 +++++++++++++++++++++++++++++++++++++++++- src/or/circuitstats.h | 12 +++ src/or/circuituse.c | 59 ++++++------- src/test/Makefile.nmake | 1 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_circuitstats.c | 199 +++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 549 insertions(+), 76 deletions(-)

1 0

[tor/master] Fix up test_circuitstats to use the new circuit_free macro
by nickm＠torproject.org 09 Dec '17

09 Dec '17

commit 241b676638285e63bd6e4ca5225444a4b16207be Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 8 17:52:45 2017 -0500 Fix up test_circuitstats to use the new circuit_free macro --- src/test/test_circuitstats.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c index 1c6a2ba28..9d87c325b 100644 --- a/src/test/test_circuitstats.c +++ b/src/test/test_circuitstats.c @@ -3,6 +3,7 @@ #define CIRCUITBUILD_PRIVATE #define CIRCUITSTATS_PRIVATE +#define CIRCUITLIST_PRIVATE #define CHANNEL_PRIVATE_ #include "or.h" @@ -22,7 +23,6 @@ origin_circuit_t *subtest_fourhop_circuit(struct timeval, int); origin_circuit_t *add_opened_threehop(void); origin_circuit_t *build_unopened_fourhop(struct timeval); -void circuit_free(circuit_t *circ); int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); static int marked_for_close; @@ -153,7 +153,7 @@ test_circuitstats_hoplen(void *arg) tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 1); tt_int_op(marked_for_close, OP_EQ, 1); - circuit_free(TO_CIRCUIT(fourhop)); + circuit_free_(TO_CIRCUIT(fourhop)); circuit_build_times_reset(get_circuit_build_times_mutable()); // Test 2: Add a threehop circuit for non-relaxed timeouts @@ -168,7 +168,7 @@ test_circuitstats_hoplen(void *arg) tt_int_op(TO_CIRCUIT(fourhop)->purpose, OP_NE, CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); - circuit_free((circuit_t *)fourhop); + circuit_free_((circuit_t *)fourhop); circuit_build_times_reset(get_circuit_build_times_mutable()); /* Test 3: This circuit should now time out and get marked as a @@ -184,8 +184,8 @@ test_circuitstats_hoplen(void *arg) done: UNMOCK(circuit_mark_for_close_); - circuit_free(TO_CIRCUIT(threehop)); - circuit_free(TO_CIRCUIT(fourhop)); + circuit_free_(TO_CIRCUIT(threehop)); + circuit_free_(TO_CIRCUIT(fourhop)); circuit_build_times_free_timeouts(get_circuit_build_times_mutable()); }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2017