diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-07 15:04:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-07 15:04:11 -0500 |
| commit | ad28397bbf1744993538fa96675a55bba59f2b57 (patch) | |
| tree | 0187431b96905bccb733a6a8ba9a19d1bb7b38d0 | |
| parent | 522b312a5155510fb539c9a85994ead13d2b19ce (diff) | |
| parent | e53e6caac533006245c28657f44e5c929e753336 (diff) | |
| download | tor-ad28397bbf1744993538fa96675a55bba59f2b57.tar.gz tor-ad28397bbf1744993538fa96675a55bba59f2b57.zip | |
Merge branch 'bug7902'
| -rw-r--r-- | changes/bug7902 | 7 | ||||
| -rw-r--r-- | src/or/reasons.c | 7 | ||||
| -rw-r--r-- | src/or/relay.c | 10 |
3 files changed, 21 insertions, 3 deletions
diff --git a/changes/bug7902 b/changes/bug7902 new file mode 100644 index 0000000000..051759dc0a --- /dev/null +++ b/changes/bug7902 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When we receive a RELAY_END cell with the reason DONE, or with no + reason, before receiving a RELAY_CONNECTED cell, report the SOCKS + status as "connection refused." Previously we reporting these + cases as success but then immediately closing the connection. + Fixes bug 7902; bugfix on 0.1.0.1-rc. Reported by "oftc_must_ + be_destroyed." diff --git a/src/or/reasons.c b/src/or/reasons.c index 26ad12e8fd..637f8cdc7d 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -105,7 +105,12 @@ stream_end_reason_to_socks5_response(int reason) case END_STREAM_REASON_DESTROY: return SOCKS5_GENERAL_ERROR; case END_STREAM_REASON_DONE: - return SOCKS5_SUCCEEDED; + /* Note that 'DONE' usually indicates a successful close from the other + * side of the stream... but if we receive it before a connected cell -- + * that is, before we have sent a SOCKS reply -- that means that the + * other side of the circuit closed the connection before telling us it + * was complete. */ + return SOCKS5_CONNECTION_REFUSED; case END_STREAM_REASON_TIMEOUT: return SOCKS5_TTL_EXPIRED; case END_STREAM_REASON_NOROUTE: diff --git a/src/or/relay.c b/src/or/relay.c index 3ae5b47ba5..5d06fd93fd 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -710,7 +710,7 @@ connection_ap_process_end_not_open( struct in_addr in; node_t *exitrouter; int reason = *(cell->payload+RELAY_HEADER_SIZE); - int control_reason = reason | END_STREAM_REASON_FLAG_REMOTE; + int control_reason; edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn); (void) layer_hint; /* unused */ @@ -734,7 +734,13 @@ connection_ap_process_end_not_open( } } - if (rh->length > 0 && edge_reason_is_retriable(reason) && + if (rh->length == 0) { + reason = END_STREAM_REASON_MISC; + } + + control_reason = reason | END_STREAM_REASON_FLAG_REMOTE; + + if (edge_reason_is_retriable(reason) && /* avoid retry if rend */ !connection_edge_is_rendezvous_stream(edge_conn)) { const char *chosen_exit_digest = |