diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-11 18:58:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-11 18:58:58 -0500 |
| commit | 0ee449ca92dc7f25517a63b63f4d521fdd48410b (patch) | |
| tree | 620c7c78bfaefec8dd3fb411cd4881bfa66895ae | |
| parent | c3720c05fa44b3790ab0dc37e2506ee482796e21 (diff) | |
| parent | 91d4bb0b000e1bdaf8569339a9b843c50e13e47e (diff) | |
| download | tor-0ee449ca92dc7f25517a63b63f4d521fdd48410b.tar tor-0ee449ca92dc7f25517a63b63f4d521fdd48410b.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/10777_netunreach | 7 | ||||
| -rw-r--r-- | changes/bug10777_internal_024 | 4 | ||||
| -rw-r--r-- | src/or/reasons.c | 5 | ||||
| -rw-r--r-- | src/or/relay.c | 6 |
4 files changed, 18 insertions, 4 deletions
diff --git a/changes/10777_netunreach b/changes/10777_netunreach new file mode 100644 index 000000000..899181423 --- /dev/null +++ b/changes/10777_netunreach @@ -0,0 +1,7 @@ + - Minor bugfixes: + + - 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. + diff --git a/changes/bug10777_internal_024 b/changes/bug10777_internal_024 new file mode 100644 index 000000000..4544147f6 --- /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/reasons.c b/src/or/reasons.c index 637f8cdc7..6eb2643a8 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): - S_CASE(ENETUNREACH): 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; diff --git a/src/or/relay.c b/src/or/relay.c index 94016b49f..dc234c1f2 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -735,13 +735,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. |