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

correct a warn message in mark_if_closed

Browse Source 
svn:r956
This commit is contained in:
Roger Dingledine 2003-12-23 07:42:01 +00:00
parent ad93c0a2bd
commit 55a94cd497
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/main.c
View File

@ -220,8 +220,10 @@ static void conn_close_if_marked(int i) {
} else { } else {
flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen); flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen);
} }
if(connection_wants_to_flush(conn)) /* not done flushing */ if(connection_wants_to_flush(conn) && buf_datalen(conn->outbuf)) {
log_fn(LOG_WARN,"Conn (socket %d) still wants to flush. Losing %d bytes!",conn->s, (int)buf_datalen(conn->inbuf)); log_fn(LOG_WARN,"Conn (socket %d) still wants to flush. Losing %d bytes!",
conn->s, (int)buf_datalen(conn->outbuf));
}
} }
connection_remove(conn); connection_remove(conn);
connection_free(conn); connection_free(conn);
@ -606,11 +608,11 @@ static void dumpstats(int severity) {
if (stats_n_data_cells_packaged) if (stats_n_data_cells_packaged)
log(severity,"Average outgoing cell fullness: %2.3f%%", log(severity,"Average outgoing cell fullness: %2.3f%%",
100*(((double)stats_n_data_bytes_packaged) / 100*(((double)stats_n_data_bytes_packaged) /
(stats_n_data_cells_packaged*(CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE))) ); (stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) );
if (stats_n_data_cells_received) if (stats_n_data_cells_received)
log(severity,"Average incoming cell fullness: %2.3f%%", log(severity,"Average incoming cell fullness: %2.3f%%",
100*(((double)stats_n_data_bytes_received) / 100*(((double)stats_n_data_bytes_received) /
(stats_n_data_cells_received*(CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE))) ); (stats_n_data_cells_received*RELAY_PAYLOAD_SIZE)) );
if (stats_n_seconds_reading) if (stats_n_seconds_reading)
log(severity,"Average bandwidth used: %d bytes/sec", log(severity,"Average bandwidth used: %d bytes/sec",