nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

some comments to point nick at the latest bugs

Browse Source 
svn:r1162
This commit is contained in:
Roger Dingledine 2004-02-28 11:48:22 +00:00
parent d1deb753db
commit 80410fa8dc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/connection.c
View File

@ -414,6 +414,9 @@ int connection_handle_read(connection_t *conn) {
router_mark_as_down(conn->nickname);
}
/* There's a read error; kill the connection.*/
/* XXX This is the place. We need to somehow indicate to
* conn that it should never try to flush, or do anything
* with conn->s but close it. */
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
return -1;
}

5
src/or/main.c
View File

@ -181,6 +181,7 @@ static void conn_read(int i) {
if (!conn->marked_for_close) {
/* this connection is broken. remove it */
/* XXX This shouldn't ever happen anymore. */
/* XXX but it'll clearly happen on MS_WINDOWS from POLLERR, right? */
log_fn(LOG_ERR,"Unhandled error on read for %s connection (fd %d); removing",
conn_type_to_string[conn->type], conn->s);
connection_mark_for_close(conn,0);
@ -220,8 +221,10 @@ static void conn_close_if_marked(int i) {
assert_connection_ok(conn, time(NULL));
if(conn->marked_for_close) {
log_fn(LOG_INFO,"Cleaning up connection (fd %d).",conn->s);
if(conn->s >= 0) { /* might be an incomplete edge connection */
if(conn->s >= 0) { /* -1 means it's an incomplete edge connection */
/* FIXME there's got to be a better way to check for this -- and make other checks? */
/* XXX the below two calls to flush_buf should not happen if the
* conn got hung up on. */
if(connection_speaks_cells(conn)) {
if(conn->state == OR_CONN_STATE_OPEN)
flush_buf_tls(conn->tls, conn->outbuf, &conn->outbuf_flushlen);