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

resolve a double-mark-for-close when things die inside connection_handle_write

Browse Source 
svn:r1702
This commit is contained in:
Roger Dingledine 2004-04-25 22:23:54 +00:00
parent 01dea610e3
commit 482d7e7cd3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/connection.c
View File

@ -674,7 +674,7 @@ int connection_outbuf_too_full(connection_t *conn) {
return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE);
} }
/* return -1 if you want to break the conn, else return 0 */ /* mark and return -1 if you want to break the conn, else return 0 */
int connection_handle_write(connection_t *conn) { int connection_handle_write(connection_t *conn) {
tor_assert(!connection_is_listener(conn)); tor_assert(!connection_is_listener(conn));
@ -732,8 +732,10 @@ int connection_handle_write(connection_t *conn) {
} }
if(!connection_wants_to_flush(conn)) /* it's done flushing */ if(!connection_wants_to_flush(conn)) /* it's done flushing */
if(connection_finished_flushing(conn) < 0) /* ...and get handled here. */ if(connection_finished_flushing(conn) < 0) { /* ...and get handled here. */
/* already marked */
return -1; return -1;
}
return 0; return 0;
} }
@ -762,7 +764,7 @@ void connection_write_to_buf(const char *string, int len, connection_t *conn) {
conn->outbuf_flushlen = MIN_TLS_FLUSHLEN; conn->outbuf_flushlen = MIN_TLS_FLUSHLEN;
if(connection_handle_write(conn) < 0) { if(connection_handle_write(conn) < 0) {
log_fn(LOG_WARN,"flushing failed."); log_fn(LOG_WARN,"flushing failed.");
connection_mark_for_close(conn,0); return;
} }
} }
if(len > 0) { /* if there's any left over */ if(len > 0) { /* if there's any left over */