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

[tor/master] Merge branch 'bug8185_025' into bug8185_031
by nickm＠torproject.org 29 Sep '17

29 Sep '17

commit 1a5746f8e1a392f0b67e36083019534bf97f1fa6 Merge: 82f109c2b d256d4c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 09:37:01 2017 -0400 Merge branch 'bug8185_025' into bug8185_031 changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --cc src/or/relay.c index cb1a0692b,48c823423..81942af1e --- a/src/or/relay.c +++ b/src/or/relay.c @@@ -824,16 -708,12 +829,22 @@@ connection_edge_send_command(edge_conne return -1; } + if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + +#ifdef MEASUREMENTS_21206 + /* Keep track of the number of RELAY_DATA cells sent for directory + * connections. */ + connection_t *linked_conn = TO_CONN(fromconn)->linked_conn; + + if (linked_conn && linked_conn->type == CONN_TYPE_DIR) { + ++(TO_DIR_CONN(linked_conn)->data_cells_sent); + } +#endif + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer);

1 0

[tor/master] Merge branches 'bug8185_031' and 'bug8185_diagnostic_032'
by nickm＠torproject.org 29 Sep '17

29 Sep '17

commit ca2e7eabc293791bb6d4664f851fb2a6374bbfb6 Merge: 3ef7e6f18 1a5746f8e 1b6ccb52e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 17:26:40 2017 -0400 Merge branches 'bug8185_031' and 'bug8185_diagnostic_032' changes/8185_diagnostic | 4 ++++ changes/bug8185_025 | 6 ++++++ src/or/relay.c | 21 ++++++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-)

1 0

[tor/master] Don't package cells onto marked circuits.
by nickm＠torproject.org 29 Sep '17

29 Sep '17

commit d256d4c0a6c6a258c4f6c6839dd53c7e304fa94f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 09:26:16 2017 -0400 Don't package cells onto marked circuits. This caused a BUG log when we noticed that the circuit had no channel. The likeliest culprit for exposing that behavior is d769cab3e5097980, where we made circuit_mark_for_close() NULL out the n_chan and p_chan fields of the circuit. Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think. --- changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug8185_025 b/changes/bug8185_025 new file mode 100644 index 000000000..1bfc12b1e --- /dev/null +++ b/changes/bug8185_025 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging, relay shutdown, annoyance): + - When a circuit is marked for close, do not attempt to package any cells + for channels on that circuit. Previously, we would detect this + condition lower in the call stack, when we noticed that the circuit had + no attached channel, and log an annoying message. Fixes bug 8185; + bugfix on 0.2.5.4-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index daf354c34..48c823423 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -390,6 +390,11 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, { channel_t *chan; /* where to send the cell */ + if (circ->marked_for_close) { + /* Circuit is marked; send nothing. */ + return 0; + } + if (cell_direction == CELL_DIRECTION_OUT) { crypt_path_t *thishop; /* counter for repeated crypts */ chan = circ->n_chan; @@ -703,6 +708,12 @@ connection_edge_send_command(edge_connection_t *fromconn, return -1; } + if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer);

1 0

[tor/master] changes tweak.
by nickm＠torproject.org 29 Sep '17

29 Sep '17

commit 9ae18b8a91b6706d0da1db730269ff7c12e7e7a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 17:27:21 2017 -0400 changes tweak. --- changes/8185_diagnostic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/8185_diagnostic b/changes/8185_diagnostic index b809c4f3e..5e4cb1f8c 100644 --- a/changes/8185_diagnostic +++ b/changes/8185_diagnostic @@ -1,4 +1,4 @@ o Minor features (logging diagnostic): - Log more circuit information whenever we are about to try to package a relay cell on a circuit with a nonexistent n_chan. - Attempt to diagnose bug 8185. + Attempt to diagnose ticket 8185.

1 0

[tor/master] Log more information when bug8185 is about to trigger.
by nickm＠torproject.org 29 Sep '17

29 Sep '17

commit 1b6ccb52eab139cd836e01316c46252e8c143288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 29 09:24:01 2017 -0400 Log more information when bug8185 is about to trigger. My current theory is that this is just a marked circuit that hasn't closed yet, but let's gather more information in case that theory is wrong. Diagnostic for 8185. --- changes/8185_diagnostic | 4 ++++ src/or/relay.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/8185_diagnostic b/changes/8185_diagnostic new file mode 100644 index 000000000..b809c4f3e --- /dev/null +++ b/changes/8185_diagnostic @@ -0,0 +1,4 @@ + o Minor features (logging diagnostic): + - Log more circuit information whenever we are about to try to + package a relay cell on a circuit with a nonexistent n_chan. + Attempt to diagnose bug 8185. diff --git a/src/or/relay.c b/src/or/relay.c index 2bfec342d..ef4b1f423 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -500,7 +500,15 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, chan = circ->n_chan; if (!chan) { log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL." - " Dropping.", filename, lineno); + " Dropping. Circuit is in state %s (%d), and is " + "%smarked for close. (%s:%d, %d)", filename, lineno, + circuit_state_to_string(circ->state), circ->state, + circ->marked_for_close ? "" : "not ", + circ->marked_for_close_file?circ->marked_for_close_file:"", + circ->marked_for_close, circ->marked_for_close_reason); + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_log_path(LOG_WARN, LD_BUG, TO_ORIGIN_CIRCUIT(circ)); + } log_backtrace(LOG_WARN,LD_BUG,""); return 0; /* just drop it */ }

1 0

[tor/master] sched: Don't get KIST stuck in an infinite loop
by nickm＠torproject.org 29 Sep '17

29 Sep '17

commit 3ef7e6f1870bf6bc2c26076c6abb545a576f9a42 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Sep 27 16:11:05 2017 -0400 sched: Don't get KIST stuck in an infinite loop When a channel is scheduled and flush cells returns 0 that is no cells to flush, we flag it back in waiting for cells so it doesn't get stuck in a possible infinite loop. It has been observed on moria1 where a closed channel end up in the scheduler where the flush process returned 0 cells but it was ultimately kept in the scheduling loop forever. We suspect that this is due to a more deeper problem in tor where the channel_more_to_flush() is actually looking at the wrong queue and was returning 1 for an empty channel thus putting the channel in the "Case 4" of the scheduler which is to go back in pending state thus re-considered at the next iteration. This is a fix that allows the KIST scheduler to recover properly from a not entirelly diagnosed problem in tor. Fixes #23676 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23676 | 6 ++++++ src/or/scheduler_kist.c | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/changes/bug23676 b/changes/bug23676 new file mode 100644 index 000000000..90f9e3180 --- /dev/null +++ b/changes/bug23676 @@ -0,0 +1,6 @@ + o Major bugfixes (scheduler): + If a channel is put into the scheduler's pending list, then it starts + closing, and then if the scheduler runs before it finishes closing, the + scheduler will get stuck trying to flush its cells while the lower layers + refuse to cooperate. Fix that race condition by given the scheduler an + escape method. Fixes bug 23676; bugfix on 0.3.2.1-alpha diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 9e960cdef..2dddd3e9a 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -591,8 +591,23 @@ kist_scheduler_run(void) if (flush_result > 0) { update_socket_written(&socket_table, chan, flush_result * (CELL_MAX_NETWORK_SIZE + TLS_PER_CELL_OVERHEAD)); + } else { + /* XXX: This can happen because tor sometimes does flush in an + * opportunistic way cells from the circuit to the outbuf so the + * channel can end up here without having anything to flush nor needed + * to write to the kernel. Hopefully we'll fix that soon but for now + * we have to handle this case which happens kind of often. */ + log_debug(LD_SCHED, + "We didn't flush anything on a chan that we think " + "can write and wants to write. The channel's state is '%s' " + "and in scheduler state %d. We're going to mark it as " + "waiting_for_cells (as that's most likely the issue) and " + "stop scheduling it this round.", + channel_state_to_string(chan->state), + chan->scheduler_state); + chan->scheduler_state = SCHED_CHAN_WAITING_FOR_CELLS; + continue; } - /* XXX What if we didn't flush? */ } /* Decide what to do with the channel now */

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 29 Sep '17

29 Sep '17

commit ac754491a74e503bc06077beba912eecef8afd13 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 29 18:18:46 2017 +0000 Update translations for torbutton-abouttorproperties_completed --- bg/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/abouttor.properties b/bg/abouttor.properties index a379bda98..d4b98d8c4 100644 --- a/bg/abouttor.properties +++ b/bg/abouttor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Дарете сега! -aboutTor.donationBanner.slogan=Tor: Гориво за дигиталната съпротива +aboutTor.donationBanner.slogan=Tor: Подкрепа на дигиталната съпротива aboutTor.donationBanner.mozilla=Дарете днес и Mozilla ще дари същата сума! aboutTor.donationBanner.tagline1=Защита на журналисти, източници и Активисти от 2006 насам

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 29 Sep '17

29 Sep '17

commit fdbfe858324edec0aa5a0e432a9837a27389b61d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 29 18:18:40 2017 +0000 Update translations for torbutton-abouttorproperties --- bg/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/abouttor.properties b/bg/abouttor.properties index f6354e351..d4b98d8c4 100644 --- a/bg/abouttor.properties +++ b/bg/abouttor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Дарете сега! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Подкрепа на дигиталната съпротива aboutTor.donationBanner.mozilla=Дарете днес и Mozilla ще дари същата сума! aboutTor.donationBanner.tagline1=Защита на журналисти, източници и Активисти от 2006 насам

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 29 Sep '17

29 Sep '17

commit 879084c5cd3faf10ed313d44cf6ecd3eafd9cebc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 29 18:17:12 2017 +0000 Update translations for tails-misc_completed --- bg.po | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bg.po b/bg.po index af49784fe..0c4974fe3 100644 --- a/bg.po +++ b/bg.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alex Alex <a.v.v73(a)abv.bg>, 2017 # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 # Gabriel Radev <gabosss(a)gmail.com>, 2015 # iliev.mb <iliev.mb(a)gmail.com>, 2015 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-05 11:57+0200\n" -"PO-Revision-Date: 2017-05-26 14:47+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-09-13 20:10+0200\n" +"PO-Revision-Date: 2017-09-29 17:47+0000\n" +"Last-Translator: Alex Alex <a.v.v73(a)abv.bg>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -343,3 +344,7 @@ msgstr "Несигурен Уеб Браузър" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" msgstr "Специфични за Tails инструменти" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 +msgid "To start a Root Terminal, you need to authenticate." +msgstr "За да получите root привилегии в терминала, трябва първо да се удостоверите."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 29 Sep '17

29 Sep '17

commit 1fb81c5985bd87faa052e2ee0c1d7f2707041a8d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 29 18:17:07 2017 +0000 Update translations for tails-misc --- bg.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bg.po b/bg.po index c23efa97d..0c4974fe3 100644 --- a/bg.po +++ b/bg.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alex Alex <a.v.v73(a)abv.bg>, 2017 # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 # Gabriel Radev <gabosss(a)gmail.com>, 2015 # iliev.mb <iliev.mb(a)gmail.com>, 2015 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-23 14:01+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-09-29 17:47+0000\n" +"Last-Translator: Alex Alex <a.v.v73(a)abv.bg>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -346,4 +347,4 @@ msgstr "Специфични за Tails инструменти" #: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 msgid "To start a Root Terminal, you need to authenticate." -msgstr "" +msgstr "За да получите root привилегии в терминала, трябва първо да се удостоверите."

1 0