Merge branch 'bug7902'

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."

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:

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 =