[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] If a socks connection ends because read fails, don"t warn t...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] If a socks connection ends because read fails, don"t warn t...
- From: arma@xxxxxxxx (Roger Dingledine)
- Date: Fri, 20 May 2005 20:15:25 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Fri, 20 May 2005 20:15:43 -0400
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or
Modified Files:
connection.c
Log Message:
If a socks connection ends because read fails, don't warn that you're
not sending a socks reply back. (bug reported by Warren Barrow)
Index: connection.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -d -r1.371 -r1.372
--- connection.c 20 May 2005 08:51:45 -0000 1.371
+++ connection.c 21 May 2005 00:15:23 -0000 1.372
@@ -996,6 +996,8 @@
connection_close_immediate(conn); /* Don't flush; connection is dead. */
if (CONN_IS_EDGE(conn)) {
connection_edge_end_errno(conn, conn->cpath_layer);
+ if (conn->socks_request) /* broken, so don't send a socks reply back */
+ conn->socks_request->has_finished = 1;
}
connection_mark_for_close(conn);
return -1;