Forward-port new reasons; clean up code more; add code to convert new reasons to SOCKS5 reply codes; add code to convert errnos to reasons. New code still needs to get invoked.

svn:r3719

1 files changed, 2 insertions, 2 deletions

diff --git a/src/or/connection.c b/src/or/connection.c
index f44185ac2d..79c98fd280 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -914,7 +914,7 @@ loop_again:
     connection_close_immediate(conn); /* Don't flush; connection is dead. */
     if (CONN_IS_EDGE(conn)) {
       connection_edge_end(conn, (char)(connection_state_is_open(conn) ?
-                  END_STREAM_REASON_MISC : END_STREAM_REASON_CONNECTFAILED),
+                  END_STREAM_REASON_MISC : END_STREAM_REASON_CONNECTREFUSED),
                   conn->cpath_layer);
     }
     connection_mark_for_close(conn);
@@ -1092,7 +1092,7 @@ int connection_handle_write(connection_t *conn) {
       if (!ERRNO_IS_CONN_EINPROGRESS(e)) {
         log_fn(LOG_INFO,"in-progress connect failed. Removing.");
         if (CONN_IS_EDGE(conn))
-          connection_edge_end(conn, END_STREAM_REASON_CONNECTFAILED,
+          connection_edge_end(conn, END_STREAM_REASON_CONNECTREFUSED,
                               conn->cpath_layer);
 
         connection_close_immediate(conn);