March 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.6] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 8450f6e9a04be27f828f27a916f6560518741ca8 Merge: fb0de57 448bd22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:21:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/ticket14128 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 5c08a19eda04906cc56d6f8fa1943bc385723412 Merge: 8450f6e 64bfc29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:23:32 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 0cbef8be8811a5ecb3df74b0c433cdb558ed19e7 Merge: 65ef97a 5c08a19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:36:39 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 Makefile.am | 2 +- changes/15188 | 3 +++ changes/bug15033 | 4 ++++ changes/bug15037 | 4 ++++ changes/bug15064 | 4 ++++ changes/bug15083 | 10 ++++++++++ changes/bug15088 | 4 ++++ changes/bug15151 | 3 +++ changes/feature15006 | 4 ++++ changes/ticket14128 | 5 +++++ src/common/sandbox.c | 1 + src/or/buffers.c | 11 +++++++++-- src/or/connection_edge.c | 5 +++-- src/or/control.c | 15 +++++++++++---- src/test/testing_common.c | 7 +++++-- src/test/zero_length_keys.sh | 4 +++- 16 files changed, 74 insertions(+), 12 deletions(-)

1 0

[tor/master] Include a HOST item in BOOTSTRAP problem messages
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 79c69d18b76e8836593e1beb3d239a5ff5e63a7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 27 11:28:30 2015 -0500 Include a HOST item in BOOTSTRAP problem messages Closes ticket 15006. --- changes/feature15006 | 4 ++++ src/or/control.c | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/feature15006 b/changes/feature15006 new file mode 100644 index 0000000..168a440 --- /dev/null +++ b/changes/feature15006 @@ -0,0 +1,4 @@ + o Minor features (controller): + - Messages about problems in the bootstrap process now include + information about the server we were trying to connect to when we + noticed the problem. Closes ticket 15006. diff --git a/src/or/control.c b/src/or/control.c index a2b9867..dc3e5fc 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5049,6 +5049,7 @@ MOCK_IMPL(void, char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; int severity; + char host[128]; /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); @@ -5078,6 +5079,8 @@ MOCK_IMPL(void, if (we_are_hibernating()) recommendation = "ignore"; + orconn_target_get_name(host, sizeof(host), or_conn); + while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */ @@ -5086,19 +5089,19 @@ MOCK_IMPL(void, log_fn(severity, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " - "count %d; recommendation %s)", + "count %d; recommendation %s; host %s)", status, summary, warn, orconn_end_reason_to_control_string(reason), - bootstrap_problems, recommendation); + bootstrap_problems, recommendation, host); connection_or_report_broken_states(severity, LD_HANDSHAKE); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " - "COUNT=%d RECOMMENDATION=%s", + "COUNT=%d RECOMMENDATION=%s HOST=\"%s\"", bootstrap_percent, tag, summary, warn, orconn_end_reason_to_control_string(reason), bootstrap_problems, - recommendation); + recommendation, host); tor_snprintf(last_sent_bootstrap_message, sizeof(last_sent_bootstrap_message), "WARN %s", buf);

1 0

[tor/master] Make boostrap events include hostname ANDaddr AND digest
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 98822df3dcdf7cd0456aee7898507dd3059f930b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 14:23:59 2015 +0100 Make boostrap events include hostname ANDaddr AND digest --- src/or/control.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index dc3e5fc..e25c3b2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5049,7 +5049,6 @@ MOCK_IMPL(void, char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; int severity; - char host[128]; /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); @@ -5079,8 +5078,6 @@ MOCK_IMPL(void, if (we_are_hibernating()) recommendation = "ignore"; - orconn_target_get_name(host, sizeof(host), or_conn); - while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */ @@ -5089,19 +5086,26 @@ MOCK_IMPL(void, log_fn(severity, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " - "count %d; recommendation %s; host %s)", + "count %d; recommendation %s; host %s at %s:%d)", status, summary, warn, orconn_end_reason_to_control_string(reason), - bootstrap_problems, recommendation, host); + bootstrap_problems, recommendation, + hex_str(or_conn->identity_digest, DIGEST_LEN), + or_conn->base_.address, + or_conn->base_.port); connection_or_report_broken_states(severity, LD_HANDSHAKE); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " - "COUNT=%d RECOMMENDATION=%s HOST=\"%s\"", + "COUNT=%d RECOMMENDATION=%s HOSTID=\"%s\" HOSTADDR=\"%s:%d\"", bootstrap_percent, tag, summary, warn, orconn_end_reason_to_control_string(reason), bootstrap_problems, - recommendation, host); + recommendation, + hex_str(or_conn->identity_digest, DIGEST_LEN), + or_conn->base_.address, + (int)or_conn->base_.port); + tor_snprintf(last_sent_bootstrap_message, sizeof(last_sent_bootstrap_message), "WARN %s", buf);

1 0

[tor/master] Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit fb0de57ba28d92421748cd3db54221c0813fdb0e Merge: 42d877f 98822df Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:05:27 2015 -0400 Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6 changes/feature15006 | 4 ++++ src/or/control.c | 15 +++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit ed7f2482e2de6f5d08dfcd605626ae8ee373cace Merge: 0ec135b fb0de57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:08:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/feature15006 | 4 ++++ src/or/control.c | 15 +++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:09:50 2015 -0400 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit e3408248b9373e52114773555d73f71492e30129 Merge: 410ce4c 6830667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:12:54 2015 -0400 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 changes/bug13988 | 3 +++ src/or/rephist.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0