November 2014 - tor-commits - lists.torproject.org

[tor/master] Fix: don't report timeout when closing parallel intro points
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 34eb007d2201bad44bd6b72681f2c3552445dfc4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Nov 10 14:38:53 2014 -0500 Fix: don't report timeout when closing parallel intro points When closing parallel introduction points, the given reason (timeout) was actually changed to "no reason" thus when the circuit purpose was CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT, we were reporting an introduction point failure and flagging it "unreachable". After three times, that intro point gets removed from the rend cache object. In the case of CIRCUIT_PURPOSE_C_INTRODUCING, the intro point was flagged has "timed out" and thus not used until the connection to the HS is closed where that flag gets reset. This commit adds an internal circuit reason called END_CIRC_REASON_IP_NOW_REDUNDANT which tells the closing circuit mechanism to not report any intro point failure. This has been observed while opening hundreds of connections to an HS on different circuit for each connection. This fix makes this use case to work like a charm. Fixes #13698. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug13698 | 4 ++++ src/or/circuitlist.c | 41 +++++++++++++++++++++++------------------ src/or/or.h | 4 ++++ src/or/rendclient.c | 5 ++--- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/changes/bug13698 b/changes/bug13698 new file mode 100644 index 0000000..71e018b --- /dev/null +++ b/changes/bug13698 @@ -0,0 +1,4 @@ + o Bugfixes: + - When closing an introduction circuit that was opened in parallel, don't + mark it unreachable which can causes it to be removed from the rend cache + object thus not usable anymore. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index c7b15e4..6f12df8 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1417,30 +1417,35 @@ circuit_mark_for_close_(circuit_t *circ, int reason, int line, tor_assert(circ->state == CIRCUIT_STATE_OPEN); tor_assert(ocirc->build_state->chosen_exit); tor_assert(ocirc->rend_data); - /* treat this like getting a nack from it */ - log_info(LD_REND, "Failed intro circ %s to %s (awaiting ack). %s", - safe_str_client(ocirc->rend_data->onion_address), - safe_str_client(build_state_get_exit_nickname(ocirc->build_state)), - timed_out ? "Recording timeout." : "Removing from descriptor."); - rend_client_report_intro_point_failure(ocirc->build_state->chosen_exit, - ocirc->rend_data, - timed_out ? - INTRO_POINT_FAILURE_TIMEOUT : - INTRO_POINT_FAILURE_GENERIC); + if (orig_reason != END_CIRC_REASON_IP_NOW_REDUNDANT) { + /* treat this like getting a nack from it */ + log_info(LD_REND, "Failed intro circ %s to %s (awaiting ack). %s", + safe_str_client(ocirc->rend_data->onion_address), + safe_str_client(build_state_get_exit_nickname(ocirc->build_state)), + timed_out ? "Recording timeout." : "Removing from descriptor."); + rend_client_report_intro_point_failure(ocirc->build_state->chosen_exit, + ocirc->rend_data, + timed_out ? + INTRO_POINT_FAILURE_TIMEOUT : + INTRO_POINT_FAILURE_GENERIC); + } } else if (circ->purpose == CIRCUIT_PURPOSE_C_INTRODUCING && reason != END_CIRC_REASON_TIMEOUT) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); if (ocirc->build_state->chosen_exit && ocirc->rend_data) { - log_info(LD_REND, "Failed intro circ %s to %s " - "(building circuit to intro point). " - "Marking intro point as possibly unreachable.", - safe_str_client(ocirc->rend_data->onion_address), - safe_str_client(build_state_get_exit_nickname(ocirc->build_state))); - rend_client_report_intro_point_failure(ocirc->build_state->chosen_exit, - ocirc->rend_data, - INTRO_POINT_FAILURE_UNREACHABLE); + if (orig_reason != END_CIRC_REASON_IP_NOW_REDUNDANT) { + log_info(LD_REND, "Failed intro circ %s to %s " + "(building circuit to intro point). " + "Marking intro point as possibly unreachable.", + safe_str_client(ocirc->rend_data->onion_address), + safe_str_client(build_state_get_exit_nickname(ocirc->build_state))); + rend_client_report_intro_point_failure(ocirc->build_state->chosen_exit, + ocirc->rend_data, + INTRO_POINT_FAILURE_UNREACHABLE); + } } } + if (circ->n_chan) { circuit_clear_cell_queue(circ, circ->n_chan); /* Only send destroy if the channel isn't closing anyway */ diff --git a/src/or/or.h b/src/or/or.h index 34f055c..f3e7b80 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -659,6 +659,10 @@ typedef enum { /* Negative reasons are internal: we never send them in a DESTROY or TRUNCATE * call; they only go to the controller for tracking */ + +/* Closing introduction point that were opened in parallel. */ +#define END_CIRC_REASON_IP_NOW_REDUNDANT -4 + /** Our post-timeout circuit time measurement period expired. * We must give up now */ #define END_CIRC_REASON_MEASUREMENT_EXPIRED -3 diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 7abbfd6..4ff000d 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -368,8 +368,7 @@ rend_client_rendcirc_has_opened(origin_circuit_t *circ) } /** - * Called to close other intro circuits we launched in parallel - * due to timeout. + * Called to close other intro circuits we launched in parallel. */ static void rend_client_close_other_intros(const char *onion_address) @@ -387,7 +386,7 @@ rend_client_close_other_intros(const char *onion_address) log_info(LD_REND|LD_CIRC, "Closing introduction circuit %d that we " "built in parallel (Purpose %d).", oc->global_identifier, c->purpose); - circuit_mark_for_close(c, END_CIRC_REASON_TIMEOUT); + circuit_mark_for_close(c, END_CIRC_REASON_IP_NOW_REDUNDANT); } } }

1 0

[tor/master] Revise changes file
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 5e4174f3b45d65999e97c32dcce0b86b056b5957 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 10:23:24 2014 -0500 Revise changes file --- changes/bug13698 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/changes/bug13698 b/changes/bug13698 index 71e018b..9af2234 100644 --- a/changes/bug13698 +++ b/changes/bug13698 @@ -1,4 +1,6 @@ - o Bugfixes: - - When closing an introduction circuit that was opened in parallel, don't - mark it unreachable which can causes it to be removed from the rend cache - object thus not usable anymore. + o Major bugfixes: + - When closing an introduction circuit that was opened in + parallel, don't mark the introduction point as + unreachable. Previously, the first successful connection to an + introduction point would make the other uintroduction points get + marked as having timed out. Fixes bug 13698; bugfix on 0.0.6rc2.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit 7d98780d4342479ade223fe871609a10e2f15097 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 14:15:08 2014 +0000 Update translations for bridgedb_completed --- hr_HR/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 1a816ae..b6acebb 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 # skiddiep <lyricaltumor(a)gmail.com>, 2014 +# Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 msgid "" 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: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Ana B\n" +"PO-Revision-Date: 2014-11-12 13:49+0000\n" +"Last-Translator: Tomislav Siroglavić <tomsiro(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,7 +89,7 @@ msgstr "Javni ključevi" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama za %s na %s u %s." +msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama\nza %s na %s u %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit ef4fb4a9cbcfe016477159a526c092e946eaa27b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 14:15:04 2014 +0000 Update translations for bridgedb --- hr_HR/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 1a816ae..b6acebb 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 # skiddiep <lyricaltumor(a)gmail.com>, 2014 +# Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 msgid "" 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: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Ana B\n" +"PO-Revision-Date: 2014-11-12 13:49+0000\n" +"Last-Translator: Tomislav Siroglavić <tomsiro(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,7 +89,7 @@ msgstr "Javni ključevi" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama za %s na %s u %s." +msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama\nza %s na %s u %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit 0b3013cba3950c0d05abd4053c552d2cb366e035 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 08:45:51 2014 +0000 Update translations for tails-misc --- sr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr.po b/sr.po index 8bf3dcf..c835228 100644 --- a/sr.po +++ b/sr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-11-12 02:56+0000\n" +"PO-Revision-Date: 2014-11-12 08:17+0000\n" "Last-Translator: obj.petit.a\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit 9bd4ebdacad3a0f5b5df7da52b22ba4935329ee7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 08:45:33 2014 +0000 Update translations for tails-greeter --- sr/sr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sr/sr.po b/sr/sr.po index 7978122..8e10d3e 100644 --- a/sr/sr.po +++ b/sr/sr.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# jelenko <svrsavamutebe(a)gmail.com>, 2013 -# milos123, 2013 +# Milenko Doder <svrsavamutebe(a)gmail.com>, 2013 +# Milos, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2014-11-12 08:16+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" @@ -198,7 +198,7 @@ msgid "" "%(stderr)s" msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Ostalo..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit 2c3133b5912107c5f05f9d6ae23582198d5b5cea Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 08:45:29 2014 +0000 Update translations for tails-persistence-setup --- sr/sr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/sr.po b/sr/sr.po index 6daa0bd..a0f83b3 100644 --- a/sr/sr.po +++ b/sr/sr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-11-12 02:34+0000\n" +"PO-Revision-Date: 2014-11-12 08:16+0000\n" "Last-Translator: obj.petit.a\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit 7d9bfe31101fefbef71be32688d14a57616bfa3b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 08:45:25 2014 +0000 Update translations for liveusb-creator --- sr/sr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sr/sr.po b/sr/sr.po index 39a2011..e6e24f2 100644 --- a/sr/sr.po +++ b/sr/sr.po @@ -6,15 +6,15 @@ # Igor Miletic <grejigl-gnomeprevod(a)yahoo.ca>, 2008 # Ivan Radeljic <radeljicivan85(a)gmail.com>, 2014 # Milos, 2013 -# objet petit a <desirdelautre(a)gmail.com>, 2014 +# obj.petit.a, 2014 # Небојша Јаковљевић <nebojsa(a)nebjak.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2014-11-12 01:30+0000\n" -"Last-Translator: objet petit a <desirdelautre(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-12 08:16+0000\n" +"Last-Translator: obj.petit.a\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit b0bfecc4a2f822180b9be06afc0898d44176dbf6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 08:45:11 2014 +0000 Update translations for gettor_completed --- sr/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sr/gettor.po b/sr/gettor.po index 33a75f5..14972a0 100644 --- a/sr/gettor.po +++ b/sr/gettor.po @@ -8,15 +8,15 @@ # lajavi.krelac <lajavi.krelacc(a)gmail.com>, 2012 # mahavidyas <mahavidyas(a)gmail.com>, 2012 # Milos, 2014 -# objet petit a <desirdelautre(a)gmail.com>, 2014 +# obj.petit.a, 2014 # pireaus <pireaus77(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-11-12 01:29+0000\n" -"Last-Translator: objet petit a <desirdelautre(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-12 08:16+0000\n" +"Last-Translator: obj.petit.a\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 Nov '14

12 Nov '14

commit 4d8f11415e992172aa5eff5f1a01743b6c71cea9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 12 08:45:08 2014 +0000 Update translations for gettor --- sr/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sr/gettor.po b/sr/gettor.po index 33a75f5..14972a0 100644 --- a/sr/gettor.po +++ b/sr/gettor.po @@ -8,15 +8,15 @@ # lajavi.krelac <lajavi.krelacc(a)gmail.com>, 2012 # mahavidyas <mahavidyas(a)gmail.com>, 2012 # Milos, 2014 -# objet petit a <desirdelautre(a)gmail.com>, 2014 +# obj.petit.a, 2014 # pireaus <pireaus77(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-11-12 01:29+0000\n" -"Last-Translator: objet petit a <desirdelautre(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-12 08:16+0000\n" +"Last-Translator: obj.petit.a\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0