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

bugfix on a really old bug:

Browse Source 
if read() fails on a stream, send back an end cell before you
close it down.


svn:r2509
This commit is contained in:
Roger Dingledine 2004-10-14 09:28:31 +00:00
parent 572714a458
commit cf9664151d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/connection.c
View File

@ -733,14 +733,18 @@ int connection_handle_read(connection_t *conn) {
if(connection_read_to_buf(conn) < 0) { if(connection_read_to_buf(conn) < 0) {
/* There's a read error; kill the connection.*/ /* There's a read error; kill the connection.*/
connection_close_immediate(conn); /* Don't flush; connection is dead. */ connection_close_immediate(conn); /* Don't flush; connection is dead. */
conn->has_sent_end = 1; /* XXX have we already sent the end? really? */ if(conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT) {
connection_edge_end(conn, connection_state_is_open(conn) ?
END_STREAM_REASON_MISC : END_STREAM_REASON_CONNECTFAILED,
conn->cpath_layer);
}
connection_mark_for_close(conn); connection_mark_for_close(conn);
if(conn->type == CONN_TYPE_DIR && if(conn->type == CONN_TYPE_DIR &&
conn->state == DIR_CONN_STATE_CONNECTING) { conn->state == DIR_CONN_STATE_CONNECTING) {
/* it's a directory server and connecting failed: forget about this router */ /* it's a directory server and connecting failed: forget about this router */
/* XXX I suspect pollerr may make Windows not get to this point. :( */ /* XXX I suspect pollerr may make Windows not get to this point. :( */
router_mark_as_down(conn->identity_digest); router_mark_as_down(conn->identity_digest);
if(conn->purpose == DIR_PURPOSE_FETCH_DIR && if(conn->purpose == DIR_PURPOSE_FETCH_DIR &&
!all_trusted_directory_servers_down()) { !all_trusted_directory_servers_down()) {
log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->address); log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->address);
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 0); directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 0);