aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-03-17 12:38:37 +0000
committerNick Mathewson <nickm@torproject.org>2005-03-17 12:38:37 +0000
commitdf9c8feac782c9feebad3a0fc7cc5eb7068bccf2 (patch)
treead090affe0b93f33441afeddda27990a33f32464 /src/or/connection.c
parentb5a7347db50ad76e8e1aaf6a6a88f733c202ca37 (diff)
downloadtor-df9c8feac782c9feebad3a0fc7cc5eb7068bccf2.tar.gz
tor-df9c8feac782c9feebad3a0fc7cc5eb7068bccf2.zip
Commit fixes for several pending tor core tasks: document all DOCDOCed functions; time out uncontrolled unattached streams; feed reasons to SOCKS5 (refactoring connection_ap_handshake_socks_reply in the process); change DirFetchPeriod/StatusFetchPeriod to have a special "Be smart" value.
svn:r3769
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 4f95f10be4..402ae61b55 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -283,8 +283,7 @@ void connection_about_to_close_connection(connection_t *conn)
conn->hold_open_until_flushed = 1;
/* XXX this socks_reply never gets sent, since conn
* gets removed right after this function finishes. */
- connection_ap_handshake_socks_reply(conn, NULL, 0, -1);
- conn->socks_request->has_finished = 1;
+ connection_ap_handshake_socks_reply(conn, NULL, 0, SOCKS5_GENERAL_ERROR);
} else {
control_event_stream_status(conn, STREAM_EVENT_CLOSED);
}