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

[tor/maint-0.2.5] 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

[torspec/master] Add an atagar-suggested clarification
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit b941a70418d0e4c6afc8f0c4ab5dc82576c2ea2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:07:55 2015 -0400 Add an atagar-suggested clarification --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index c641788..a88153c 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1929,7 +1929,8 @@ there's a bootstrapping problem. The "host" value is the identity digest (in hex) of the node we're - trying to connect to; the "hostaddr" is an address:port combination. + trying to connect to; the "hostaddr" is an address:port combination, + where 'address' is an ipv4 or ipv6 address. Currently Tor uses recommendation=ignore for the first nine bootstrap problem reports for a given phase, and then

1 0

[torspec/master] Merge branch 'feature15006'
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit b4d3d46858695b82bcfad668531693d1916ba580 Merge: ab64534 b941a70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:08:03 2015 -0400 Merge branch 'feature15006' control-spec.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

1 0

[torspec/master] Describe the HOST field of bootstrap messages, for 15006.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit e414a520eaf7ece983fb19c647da6742c12b62e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 27 11:29:54 2015 -0500 Describe the HOST field of bootstrap messages, for 15006. --- control-spec.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index b527a40..d01c2e9 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1887,6 +1887,7 @@ "REASON=" Keyword "COUNT=" num "RECOMMENDATION=" Keyword + [HOST=" QString ] Tor has made some progress at establishing a connection to the @@ -1927,6 +1928,9 @@ the controller should alert the user that Tor is pretty sure there's a bootstrapping problem. + The "host" values are a description of the node that we're trying to + connect to. This can be a LongName, or an Address : Port . + Currently Tor uses recommendation=ignore for the first nine bootstrap problem reports for a given phase, and then uses recommendation=warn for subsequent problems at that

1 0

[torspec/master] Fix issues noted by atagar
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 21be1dbeeb90e031d90f1af38041ea7f80573d64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 27 11:42:48 2015 -0500 Fix issues noted by atagar --- control-spec.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index d01c2e9..3b6eab6 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1883,12 +1883,11 @@ "PROGRESS=" num "TAG=" Keyword "SUMMARY=" String - ["WARNING=" String - "REASON=" Keyword - "COUNT=" num - "RECOMMENDATION=" Keyword - [HOST=" QString - ] + ["WARNING=" String] + ["REASON=" Keyword] + ["COUNT=" num] + ["RECOMMENDATION=" Keyword] + ["HOST=" QuotedString] Tor has made some progress at establishing a connection to the Tor network, fetching directory information, or making its first

1 0

[torspec/master] describe host and hostaddr for bootstrap problems
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit b0ebde6878b5a63afa8913205ba339944d3a6055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 14:25:34 2015 +0100 describe host and hostaddr for bootstrap problems --- control-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 3b6eab6..c641788 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1888,6 +1888,7 @@ ["COUNT=" num] ["RECOMMENDATION=" Keyword] ["HOST=" QuotedString] + ["HOSTADDR=" QuotedString] Tor has made some progress at establishing a connection to the Tor network, fetching directory information, or making its first @@ -1927,8 +1928,8 @@ the controller should alert the user that Tor is pretty sure there's a bootstrapping problem. - The "host" values are a description of the node that we're trying to - connect to. This can be a LongName, or an Address : Port . + The "host" value is the identity digest (in hex) of the node we're + trying to connect to; the "hostaddr" is an address:port combination. Currently Tor uses recommendation=ignore for the first nine bootstrap problem reports for a given phase, and then

1 0

[tor/maint-0.2.6] 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/maint-0.2.6] 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/maint-0.2.6] 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] Changes file for 15188
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 42d877f0847f5541108328c52fb671740b888a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 11:13:57 2015 -0400 Changes file for 15188 --- changes/15188 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/15188 b/changes/15188 new file mode 100644 index 0000000..2065b39 --- /dev/null +++ b/changes/15188 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug + 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt.

1 0