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/relay.c | |
| parent | fc66a2ad1bf1e653cae47eb54fc6324d29d5916e (diff) | |
| download | tor-78e4aa63fbc8b65ebf94234300b0d21e573ebe6e.tar.gz tor-78e4aa63fbc8b65ebf94234300b0d21e573ebe6e.zip | |
Backport END_STREAM_REASON_NOROUTE for client use.
(Partial backport of 150ed553dfce9, 161b275028e90, and 4c948ffd6.)
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 2082da94fe..b3d2fbb026 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -648,7 +648,8 @@ edge_reason_is_retriable(int reason) reason == END_STREAM_REASON_RESOURCELIMIT || reason == END_STREAM_REASON_EXITPOLICY || reason == END_STREAM_REASON_RESOLVEFAILED || - reason == END_STREAM_REASON_MISC; + reason == END_STREAM_REASON_MISC || + reason == END_STREAM_REASON_NOROUTE; } /** Called when we receive an END cell on a stream that isn't open yet, @@ -743,6 +744,7 @@ connection_ap_process_end_not_open( case END_STREAM_REASON_RESOLVEFAILED: case END_STREAM_REASON_TIMEOUT: case END_STREAM_REASON_MISC: + case END_STREAM_REASON_NOROUTE: if (client_dns_incr_failures(conn->socks_request->address) < MAX_RESOLVE_FAILURES) { /* We haven't retried too many times; reattach the connection. */ |