diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-08-03 16:46:28 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-18 11:12:32 -0400 |
| commit | 78e4aa63fbc8b65ebf94234300b0d21e573ebe6e (patch) | |
| tree | 902f24a04c001ad697a9f81ca2dc866931cd47ca /src/or/reasons.c | |
| parent | fc66a2ad1bf1e653cae47eb54fc6324d29d5916e (diff) | |
| download | tor-78e4aa63fbc8b65ebf94234300b0d21e573ebe6e.tar tor-78e4aa63fbc8b65ebf94234300b0d21e573ebe6e.tar.gz | |
Backport END_STREAM_REASON_NOROUTE for client use.
(Partial backport of 150ed553dfce9, 161b275028e90, and 4c948ffd6.)
Diffstat (limited to 'src/or/reasons.c')
| -rw-r--r-- | src/or/reasons.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/or/reasons.c b/src/or/reasons.c index 45b592367..82e5f9921 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -26,6 +26,7 @@ stream_end_reason_to_control_string(int reason) case END_STREAM_REASON_DESTROY: return "DESTROY"; case END_STREAM_REASON_DONE: return "DONE"; case END_STREAM_REASON_TIMEOUT: return "TIMEOUT"; + case END_STREAM_REASON_NOROUTE: return "NOROUTE"; case END_STREAM_REASON_HIBERNATING: return "HIBERNATING"; case END_STREAM_REASON_INTERNAL: return "INTERNAL"; case END_STREAM_REASON_RESOURCELIMIT: return "RESOURCELIMIT"; @@ -60,6 +61,7 @@ stream_end_reason_to_string(int reason) case END_STREAM_REASON_DESTROY: return "destroyed"; case END_STREAM_REASON_DONE: return "closed normally"; case END_STREAM_REASON_TIMEOUT: return "gave up (timeout)"; + case END_STREAM_REASON_NOROUTE: return "no route to host"; case END_STREAM_REASON_HIBERNATING: return "server is hibernating"; case END_STREAM_REASON_INTERNAL: return "internal error at server"; case END_STREAM_REASON_RESOURCELIMIT: return "server out of resources"; @@ -102,6 +104,8 @@ stream_end_reason_to_socks5_response(int reason) return SOCKS5_SUCCEEDED; case END_STREAM_REASON_TIMEOUT: return SOCKS5_TTL_EXPIRED; + case END_STREAM_REASON_NOROUTE: + return SOCKS5_HOST_UNREACHABLE; case END_STREAM_REASON_RESOURCELIMIT: return SOCKS5_GENERAL_ERROR; case END_STREAM_REASON_HIBERNATING: @@ -162,6 +166,14 @@ errno_to_stream_end_reason(int e) S_CASE(ENOTCONN): S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; + E_CASE(EHOSTUNREACH): + /* XXXX022 + * The correct behavior is END_STREAM_REASON_NOROUTE, but older + * clients don't recognize it. So we're going to continue sending + * "MISC" until 0.2.1.27 or later is "well established". + */ + /* return END_STREAM_REASON_NOROUTE; */ + return END_STREAM_REASON_MISC; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED; S_CASE(ECONNRESET): |