September 2017 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit cf5af4b4aaf75020e9c188c9bcabaa553e550ce6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 14:45:04 2017 +0000 Update translations for bridgedb --- am/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am/LC_MESSAGES/bridgedb.po b/am/LC_MESSAGES/bridgedb.po index 8962dc943..7df282e20 100644 --- a/am/LC_MESSAGES/bridgedb.po +++ b/am/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-19 19:57+0000\n" +"PO-Revision-Date: 2017-09-22 14:33+0000\n" "Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Use setup_full_capture_of_logs for 21800
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit 230a33679814f3074c0ba43e42dc7b38b5342c10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 10:22:47 2017 -0400 Use setup_full_capture_of_logs for 21800 setup_capture_of_logs() doesn't actually suppress warnings :p --- src/test/test_util.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1749617c2..49ebdf211 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -635,7 +635,7 @@ test_util_time(void *arg) * time_t */ a_time.tm_year = 2039-1900; #if SIZEOF_TIME_T == 4 - setup_capture_of_logs(LOG_WARN); + setup_full_capture_of_logs(LOG_WARN); tt_int_op((time_t) -1,OP_EQ, tor_timegm(&a_time)); expect_single_log_msg_containing("Result does not fit in tor_timegm"); teardown_capture_of_logs(); @@ -654,8 +654,7 @@ test_util_time(void *arg) setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ - expect_log_msg_containing(msg); \ - tt_int_op(1, OP_EQ, smartlist_len(mock_saved_logs())); \ + expect_single_log_msg_containing(msg); \ teardown_capture_of_logs(); \ } while (0) @@ -1226,7 +1225,7 @@ test_util_parse_http_time(void *arg) #if SIZEOF_TIME_T == 4 /* parse_http_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. */ - setup_capture_of_logs(LOG_WARN); + setup_full_capture_of_logs(LOG_WARN); tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time)); tt_int_op((time_t)-1,OP_EQ, tor_timegm(&a_time)); expect_single_log_msg_containing("does not fit in tor_timegm");

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 22 Sep '17

22 Sep '17

commit d0a2a2b73db69c1839c3ba7f570cc8d19e7f7999 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 22 14:15:50 2017 +0000 Update translations for tails-persistence-setup --- am/am.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am/am.po b/am/am.po index 044582ef5..42d6239bb 100644 --- a/am/am.po +++ b/am/am.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-19 19:57+0000\n" +"PO-Revision-Date: 2017-09-22 14:01+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] sched: only log when scheduler type changes
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit 22699e3f166f4c20ea0727cef9b20b936bb3ac7c Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Sep 21 13:15:51 2017 -0400 sched: only log when scheduler type changes Closes 23552. Thanks dgoulet for original impl --- changes/bug23552 | 3 +++ src/or/scheduler.c | 40 ++++++++++++++++++++++++++++++++++++++-- src/or/scheduler.h | 25 +++++++++++++++---------- src/or/scheduler_kist.c | 3 +++ src/or/scheduler_vanilla.c | 1 + 5 files changed, 60 insertions(+), 12 deletions(-) diff --git a/changes/bug23552 b/changes/bug23552 new file mode 100644 index 000000000..4a4e9b47b --- /dev/null +++ b/changes/bug23552 @@ -0,0 +1,3 @@ + o Minor bugfixes (scheduler): + - Only notice log the selected scheduler when we switch scheduler types. + Fixes bug 23552; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 84ae877a1..da5ddb332 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -174,6 +174,25 @@ STATIC struct event *run_sched_ev = NULL; * Functions that can only be accessed from this file. *****************************************************************************/ +/** Return a human readable string for the given scheduler type. */ +static const char * +get_scheduler_type_string(scheduler_types_t type) +{ + switch(type) { + case SCHEDULER_VANILLA: + return "Vanilla"; + case SCHEDULER_KIST: + return "KIST"; + case SCHEDULER_KIST_LITE: + return "KISTLite"; + case SCHEDULER_NONE: + /* fallthrough */ + default: + tor_assert_unreached(); + return "(N/A)"; + } +} + /** * Scheduler event callback; this should get triggered once per event loop * if any scheduling work was created during the event loop. @@ -312,6 +331,8 @@ select_scheduler(void) new_scheduler = get_kist_scheduler(); scheduler_kist_set_lite_mode(); goto end; + case SCHEDULER_NONE: + /* fallthrough */ default: /* Our option validation should have caught this. */ tor_assert_unreached(); @@ -333,8 +354,6 @@ select_scheduler(void) /* Set the chosen scheduler. */ the_scheduler = new_scheduler; - log_notice(LD_CONFIG, "Scheduler type %s has been enabled.", - chosen_sched_type); } /** @@ -346,11 +365,21 @@ static void set_scheduler(void) { const scheduler_t *old_scheduler = the_scheduler; + scheduler_types_t old_scheduler_type = SCHEDULER_NONE; + + /* We keep track of the type in order to log only if the type switched. We + * can't just use the scheduler pointers because KIST and KISTLite share the + * same object. */ + if (the_scheduler) { + old_scheduler_type = the_scheduler->type; + } /* From the options, select the scheduler type to set. */ select_scheduler(); tor_assert(the_scheduler); + /* We look at the pointer difference in case the old sched and new sched + * share the same scheduler object, as is the case with KIST and KISTLite. */ if (old_scheduler != the_scheduler) { /* Allow the old scheduler to clean up, if needed. */ if (old_scheduler && old_scheduler->free_all) { @@ -362,6 +391,13 @@ set_scheduler(void) the_scheduler->init(); } } + + /* Finally we notice log if we switched schedulers. We use the type in case + * two schedulers share a scheduler object. */ + if (old_scheduler_type != the_scheduler->type) { + log_notice(LD_CONFIG, "Scheduler type %s has been enabled.", + get_scheduler_type_string(the_scheduler->type)); + } } /** diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 93da1c904..f740230b1 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -13,7 +13,17 @@ #include "channel.h" #include "testsupport.h" -/* +/** Scheduler type, we build an ordered list with those values from the + * parsed strings in Schedulers. The reason to do such a thing is so we can + * quickly and without parsing strings select the scheduler at anytime. */ +typedef enum { + SCHEDULER_NONE = -1, + SCHEDULER_VANILLA = 1, + SCHEDULER_KIST = 2, + SCHEDULER_KIST_LITE = 3, +} scheduler_types_t; + +/** * A scheduler implementation is a collection of function pointers. If you * would like to add a new scheduler called foo, create scheduler_foo.c, * implement at least the mandatory ones, and implement get_foo_scheduler() @@ -31,6 +41,10 @@ * is shutting down), then set that function pointer to NULL. */ typedef struct scheduler_s { + /* Scheduler type. This is used for logging when the scheduler is switched + * during runtime. */ + scheduler_types_t type; + /* (Optional) To be called when we want to prepare a scheduler for use. * Perhaps Tor just started and we are the lucky chosen scheduler, or * perhaps Tor is switching to this scheduler. No matter the case, this is @@ -82,15 +96,6 @@ typedef struct scheduler_s { void (*on_new_options)(void); } scheduler_t; -/** Scheduler type, we build an ordered list with those values from the - * parsed strings in Schedulers. The reason to do such a thing is so we can - * quickly and without parsing strings select the scheduler at anytime. */ -typedef enum { - SCHEDULER_VANILLA = 1, - SCHEDULER_KIST = 2, - SCHEDULER_KIST_LITE = 3, -} scheduler_types_t; - /***************************************************************************** * Globally visible scheduler variables/values * diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 8b0c81c4c..5ba31bb87 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -687,6 +687,7 @@ kist_scheduler_run(void) /* Stores the kist scheduler function pointers. */ static scheduler_t kist_scheduler = { + .type = SCHEDULER_KIST, .free_all = kist_free_all, .on_channel_free = kist_on_channel_free, .init = kist_scheduler_init, @@ -738,6 +739,7 @@ void scheduler_kist_set_lite_mode(void) { kist_lite_mode = 1; + kist_scheduler.type = SCHEDULER_KIST_LITE; log_info(LD_SCHED, "Setting KIST scheduler without kernel support (KISTLite mode)"); } @@ -747,6 +749,7 @@ void scheduler_kist_set_full_mode(void) { kist_lite_mode = 0; + kist_scheduler.type = SCHEDULER_KIST; log_info(LD_SCHED, "Setting KIST scheduler with kernel support (KIST mode)"); } diff --git a/src/or/scheduler_vanilla.c b/src/or/scheduler_vanilla.c index a49f7a1cb..303b3dbba 100644 --- a/src/or/scheduler_vanilla.c +++ b/src/or/scheduler_vanilla.c @@ -179,6 +179,7 @@ vanilla_scheduler_run(void) /* Stores the vanilla scheduler function pointers. */ static scheduler_t vanilla_scheduler = { + .type = SCHEDULER_VANILLA, .free_all = NULL, .on_channel_free = NULL, .init = NULL,

1 0

[tor/master] sched: move code to respect comments
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit 88b317ef28b6c8d3851f7fbecadd3f15497a7574 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Sep 21 13:24:07 2017 -0400 sched: move code to respect comments The diff is confusing, but were two static scheduler functions that needed moving to static comment block. No code change. Thanks dgoulet for original commit --- src/or/scheduler.c | 118 ++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index da5ddb332..d17d16511 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -223,65 +223,6 @@ scheduler_evt_callback(evutil_socket_t fd, short events, void *arg) the_scheduler->schedule(); } -/***************************************************************************** - * Scheduling system private function definitions - * - * Functions that can only be accessed from scheduler*.c - *****************************************************************************/ - -/** Return the pending channel list. */ -smartlist_t * -get_channels_pending(void) -{ - return channels_pending; -} - -/** Comparison function to use when sorting pending channels. */ -MOCK_IMPL(int, -scheduler_compare_channels, (const void *c1_v, const void *c2_v)) -{ - const channel_t *c1 = NULL, *c2 = NULL; - /* These are a workaround for -Wbad-function-cast throwing a fit */ - const circuitmux_policy_t *p1, *p2; - uintptr_t p1_i, p2_i; - - tor_assert(c1_v); - tor_assert(c2_v); - - c1 = (const channel_t *)(c1_v); - c2 = (const channel_t *)(c2_v); - - if (c1 != c2) { - if (circuitmux_get_policy(c1->cmux) == - circuitmux_get_policy(c2->cmux)) { - /* Same cmux policy, so use the mux comparison */ - return circuitmux_compare_muxes(c1->cmux, c2->cmux); - } else { - /* - * Different policies; not important to get this edge case perfect - * because the current code never actually gives different channels - * different cmux policies anyway. Just use this arbitrary but - * definite choice. - */ - p1 = circuitmux_get_policy(c1->cmux); - p2 = circuitmux_get_policy(c2->cmux); - p1_i = (uintptr_t)p1; - p2_i = (uintptr_t)p2; - - return (p1_i < p2_i) ? -1 : 1; - } - } else { - /* c1 == c2, so always equal */ - return 0; - } -} - -/***************************************************************************** - * Scheduling system global functions - * - * Functions that can be accessed from anywhere in Tor. - *****************************************************************************/ - /** Using the global options, select the scheduler we should be using. */ static void select_scheduler(void) @@ -400,6 +341,65 @@ set_scheduler(void) } } +/***************************************************************************** + * Scheduling system private function definitions + * + * Functions that can only be accessed from scheduler*.c + *****************************************************************************/ + +/** Return the pending channel list. */ +smartlist_t * +get_channels_pending(void) +{ + return channels_pending; +} + +/** Comparison function to use when sorting pending channels. */ +MOCK_IMPL(int, +scheduler_compare_channels, (const void *c1_v, const void *c2_v)) +{ + const channel_t *c1 = NULL, *c2 = NULL; + /* These are a workaround for -Wbad-function-cast throwing a fit */ + const circuitmux_policy_t *p1, *p2; + uintptr_t p1_i, p2_i; + + tor_assert(c1_v); + tor_assert(c2_v); + + c1 = (const channel_t *)(c1_v); + c2 = (const channel_t *)(c2_v); + + if (c1 != c2) { + if (circuitmux_get_policy(c1->cmux) == + circuitmux_get_policy(c2->cmux)) { + /* Same cmux policy, so use the mux comparison */ + return circuitmux_compare_muxes(c1->cmux, c2->cmux); + } else { + /* + * Different policies; not important to get this edge case perfect + * because the current code never actually gives different channels + * different cmux policies anyway. Just use this arbitrary but + * definite choice. + */ + p1 = circuitmux_get_policy(c1->cmux); + p2 = circuitmux_get_policy(c2->cmux); + p1_i = (uintptr_t)p1; + p2_i = (uintptr_t)p2; + + return (p1_i < p2_i) ? -1 : 1; + } + } else { + /* c1 == c2, so always equal */ + return 0; + } +} + +/***************************************************************************** + * Scheduling system global functions + * + * Functions that can be accessed from anywhere in Tor. + *****************************************************************************/ + /** * This is how the scheduling system is notified of Tor's configuration * changing. For example: a SIGHUP was issued.

1 0

[tor/master] Merge remote-tracking branch 'pastly/bug23552_032_03'
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit 122eab78d988728f2c71b4fdcc98e996409ff4b2 Merge: cce936aee 88b317ef2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:54:41 2017 -0400 Merge remote-tracking branch 'pastly/bug23552_032_03' changes/bug23552 | 3 + src/or/scheduler.c | 158 ++++++++++++++++++++++++++++----------------- src/or/scheduler.h | 25 ++++--- src/or/scheduler_kist.c | 3 + src/or/scheduler_vanilla.c | 1 + 5 files changed, 119 insertions(+), 71 deletions(-)

1 0

[tor/master] Remove unused chosen_scheduler_type variable.
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit ac3fdb74c20cd3b52e5fdfa19b247b2edff9cb6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:56:54 2017 -0400 Remove unused chosen_scheduler_type variable. --- src/or/scheduler.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index d17d16511..cc0161122 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -227,7 +227,6 @@ scheduler_evt_callback(evutil_socket_t fd, short events, void *arg) static void select_scheduler(void) { - const char *chosen_sched_type = NULL; scheduler_t *new_scheduler = NULL; #ifdef TOR_UNIT_TESTS @@ -246,7 +245,6 @@ select_scheduler(void) switch (*type) { case SCHEDULER_VANILLA: new_scheduler = get_vanilla_scheduler(); - chosen_sched_type = "Vanilla"; goto end; case SCHEDULER_KIST: if (!scheduler_can_use_kist()) { @@ -264,11 +262,9 @@ select_scheduler(void) continue; } new_scheduler = get_kist_scheduler(); - chosen_sched_type = "KIST"; scheduler_kist_set_full_mode(); goto end; case SCHEDULER_KIST_LITE: - chosen_sched_type = "KISTLite"; new_scheduler = get_kist_scheduler(); scheduler_kist_set_lite_mode(); goto end;

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit 9b02641812c05ef2fb0d3148aaee023d89fb9af8 Merge: 7f3dc8327 dc5c9af6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/maint-0.3.1] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit dc5c9af6c383b97b47f86b3860e9693686bf0466 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..f2dc8bd1a --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index e065ef64f..bc493e297 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -253,7 +253,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: hs_cell_establish_intro_free(parsed_cell);

1 0

[tor/maint-0.3.0] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit dc5c9af6c383b97b47f86b3860e9693686bf0466 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..f2dc8bd1a --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index e065ef64f..bc493e297 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -253,7 +253,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: hs_cell_establish_intro_free(parsed_cell);

1 0