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

warn more when losing data on closed/marked connections.

Browse Source 
svn:r1203
This commit is contained in:
Nick Mathewson 2004-03-03 02:07:57 +00:00
parent 49281424ae
commit 6379dbbe2a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection.c
View File

@ -153,6 +153,10 @@ void connection_close_immediate(connection_t *conn)
log_fn(LOG_WARN,"Attempt to close already-closed connection.");
return;
}
if (conn->outbuf_flushlen) {
log_fn(LOG_INFO,"Closing connection (fd %d, type %d, state %d) with data on outbuf.",
conn->s, conn->type, conn->state);
}
close(conn->s);
conn->s = -1;
if(!connection_is_listener(conn)) {

11
src/or/main.c
View File

@ -229,18 +229,23 @@ 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) {
if(conn->s >= 0 && connection_wants_to_flush(conn)) {
/* -1 means it's an incomplete edge connection, or that the socket
* has already been closed as unflushable. */
/* FIXME there's got to be a better way to check for this -- and make other checks? */
log_fn(LOG_WARN,
"Conn (fd %d, type %d, state %d) marked for close, but wants to flush.",
conn->s, conn->type, conn->state);
if(connection_speaks_cells(conn)) {
if(conn->state == OR_CONN_STATE_OPEN)
if(conn->state == OR_CONN_STATE_OPEN && conn->outbuf_flushlen) {
flush_buf_tls(conn->tls, conn->outbuf, &conn->outbuf_flushlen);
}
} else {
flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen);
}
if(connection_wants_to_flush(conn) && buf_datalen(conn->outbuf)) {
log_fn(LOG_WARN,"Conn (socket %d) still wants to flush. Losing %d bytes!",
log_fn(LOG_WARN,"Conn (fd %d) still wants to flush. Losing %d bytes!",
conn->s, (int)buf_datalen(conn->outbuf));
}
}