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

[tor/master] Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 8836c1ee2f460422a688781c79760652524c3d6e Merge: 7f6aa78 b15f75b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:55:26 2014 -0500 Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4 changes/bug10777_internal_024 | 4 ++++ src/or/relay.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] update changes file
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 0844a262a247d08673040813e2949bc0202d42e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:57:38 2014 -0500 update changes file --- changes/10777_netunreach | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach index 369774f..8991814 100644 --- a/changes/10777_netunreach +++ b/changes/10777_netunreach @@ -1,7 +1,7 @@ - Minor bugfixes: - - Treat ENETUNRECH at an exit node as a NOROUTE error, not an - INTERNAL error, since it can apparently happen when trying to - connect to the wrong sort of netblocks. Fixes a part of bug 10777; - bugfix on 0.1.0.1-rc. + - Treat ENETUNREACH, EACCES, and EPERM at an exit node as a + NOROUTE error, not an INTERNAL error, since they can apparently + happen when trying to connect to the wrong sort of + netblocks. Fixes a part of bug 10777; bugfix on 0.1.0.1-rc.

1 0

[tor/master] Merge branch 'bug10777_netunreach_024' into maint-0.2.4
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 91d4bb0b000e1bdaf8569339a9b843c50e13e47e Merge: 8836c1e 0844a26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:57:55 2014 -0500 Merge branch 'bug10777_netunreach_024' into maint-0.2.4 changes/10777_netunreach | 7 +++++++ src/or/reasons.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 0ee449ca92dc7f25517a63b63f4d521fdd48410b Merge: c3720c0 91d4bb0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:58:58 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' changes/10777_netunreach | 7 +++++++ changes/bug10777_internal_024 | 4 ++++ src/or/reasons.c | 5 +++-- src/or/relay.c | 6 ++++-- 4 files changed, 18 insertions(+), 4 deletions(-)

1 0

[tor/master] Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit b15f75b63266742aa6aa358c553799a31f0b350e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:35:14 2014 -0500 Don't treat END_STREAM_REASON_INTERNAL as total circuit failure It can happen because we sent something that got an ENETUNREACH response. Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777. --- changes/bug10777_internal_024 | 4 ++++ src/or/relay.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug10777_internal_024 b/changes/bug10777_internal_024 new file mode 100644 index 0000000..4544147 --- /dev/null +++ b/changes/bug10777_internal_024 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Do not treat END_STREAM_REASON_INTERNAL as indicating a definite + circuit failure, since it could also indicate an ENETUNREACH + error. Fixes part of bug 10777; bugfix on 0.2.4.8-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index 63119cb..57633f8 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -731,13 +731,15 @@ connection_ap_process_end_not_open( if (rh->length > 0) { if (reason == END_STREAM_REASON_TORPROTOCOL || - reason == END_STREAM_REASON_INTERNAL || reason == END_STREAM_REASON_DESTROY) { - /* All three of these reasons could mean a failed tag + /* Both of these reasons could mean a failed tag * hit the exit and it complained. Do not probe. * Fail the circuit. */ circ->path_state = PATH_STATE_USE_FAILED; return -END_CIRC_REASON_TORPROTOCOL; + } else if (reason == END_STREAM_REASON_INTERNAL) { + /* We can't infer success or failure, since older Tors report + * ENETUNREACH as END_STREAM_REASON_INTERNAL. */ } else { /* Path bias: If we get a valid reason code from the exit, * it wasn't due to tagging.

1 0

[tor/master] Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL.
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit f5d32c08ba0b7307873324f8b24c4142523c1155 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:30:23 2014 -0500 Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL. Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc. --- changes/10777_netunreach | 7 +++++++ src/or/reasons.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach new file mode 100644 index 0000000..369774f --- /dev/null +++ b/changes/10777_netunreach @@ -0,0 +1,7 @@ + - Minor bugfixes: + + - Treat ENETUNRECH at an exit node as a NOROUTE error, not an + INTERNAL error, since it can apparently happen when trying to + connect to the wrong sort of netblocks. Fixes a part of bug 10777; + bugfix on 0.1.0.1-rc. + diff --git a/src/or/reasons.c b/src/or/reasons.c index 637f8cd..fc31a43 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -176,8 +176,8 @@ errno_to_stream_end_reason(int e) S_CASE(EAFNOSUPPORT): E_CASE(EACCES): S_CASE(ENOTCONN): - S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; + S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED):

1 0

[tor/master] make EACCES survivable too.
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit e0c8031516852143fb82d8fee91a0f4c576c7418 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 15:06:10 2014 -0500 make EACCES survivable too. --- src/or/reasons.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/reasons.c b/src/or/reasons.c index fc31a43..6eb2643 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -174,11 +174,12 @@ errno_to_stream_end_reason(int e) S_CASE(ENOTSOCK): S_CASE(EPROTONOSUPPORT): S_CASE(EAFNOSUPPORT): - E_CASE(EACCES): S_CASE(ENOTCONN): return END_STREAM_REASON_INTERNAL; S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): + E_CASE(EACCES): + E_CASE(EPERM): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED;

1 0

[tor/maint-0.2.4] update changes file
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 0844a262a247d08673040813e2949bc0202d42e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:57:38 2014 -0500 update changes file --- changes/10777_netunreach | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach index 369774f..8991814 100644 --- a/changes/10777_netunreach +++ b/changes/10777_netunreach @@ -1,7 +1,7 @@ - Minor bugfixes: - - Treat ENETUNRECH at an exit node as a NOROUTE error, not an - INTERNAL error, since it can apparently happen when trying to - connect to the wrong sort of netblocks. Fixes a part of bug 10777; - bugfix on 0.1.0.1-rc. + - Treat ENETUNREACH, EACCES, and EPERM at an exit node as a + NOROUTE error, not an INTERNAL error, since they can apparently + happen when trying to connect to the wrong sort of + netblocks. Fixes a part of bug 10777; bugfix on 0.1.0.1-rc.

1 0

[tor/maint-0.2.4] Merge branch 'bug10777_netunreach_024' into maint-0.2.4
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 91d4bb0b000e1bdaf8569339a9b843c50e13e47e Merge: 8836c1e 0844a26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:57:55 2014 -0500 Merge branch 'bug10777_netunreach_024' into maint-0.2.4 changes/10777_netunreach | 7 +++++++ src/or/reasons.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL.
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit f5d32c08ba0b7307873324f8b24c4142523c1155 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:30:23 2014 -0500 Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL. Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc. --- changes/10777_netunreach | 7 +++++++ src/or/reasons.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/10777_netunreach b/changes/10777_netunreach new file mode 100644 index 0000000..369774f --- /dev/null +++ b/changes/10777_netunreach @@ -0,0 +1,7 @@ + - Minor bugfixes: + + - Treat ENETUNRECH at an exit node as a NOROUTE error, not an + INTERNAL error, since it can apparently happen when trying to + connect to the wrong sort of netblocks. Fixes a part of bug 10777; + bugfix on 0.1.0.1-rc. + diff --git a/src/or/reasons.c b/src/or/reasons.c index 637f8cd..fc31a43 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -176,8 +176,8 @@ errno_to_stream_end_reason(int e) S_CASE(EAFNOSUPPORT): E_CASE(EACCES): S_CASE(ENOTCONN): - S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; + S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED):

1 0