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

print the IP if a conn fails badly, to see if there are any trends

Browse Source 
svn:r2400
This commit is contained in:
Roger Dingledine 2004-09-29 05:59:55 +00:00
parent 1c47de319e
commit 6ed095b177
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/main.c
View File

@ -297,6 +297,7 @@ static void conn_write(int i) {
static void conn_close_if_marked(int i) { static void conn_close_if_marked(int i) {
connection_t *conn; connection_t *conn;
int retval; int retval;
struct in_addr in;
conn = connection_array[i]; conn = connection_array[i];
assert_connection_ok(conn, time(NULL)); assert_connection_ok(conn, time(NULL));
@ -308,11 +309,12 @@ static void conn_close_if_marked(int i) {
if(conn->s >= 0 && connection_wants_to_flush(conn)) { if(conn->s >= 0 && connection_wants_to_flush(conn)) {
/* -1 means it's an incomplete edge connection, or that the socket /* -1 means it's an incomplete edge connection, or that the socket
* has already been closed as unflushable. */ * has already been closed as unflushable. */
in.s_addr = htonl(conn->addr);
if(!conn->hold_open_until_flushed) if(!conn->hold_open_until_flushed)
log_fn(LOG_WARN, log_fn(LOG_INFO,
"Conn (fd %d, type %s, state %d) marked, but wants to flush %d bytes. " "Conn (addr %s, fd %d, type %s, state %d) marked, but wants to flush %d bytes. "
"(Marked at %s:%d)", "(Marked at %s:%d)",
conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state, inet_ntoa(in), conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state,
conn->outbuf_flushlen, conn->marked_for_close_file, conn->marked_for_close); conn->outbuf_flushlen, conn->marked_for_close_file, conn->marked_for_close);
if(connection_speaks_cells(conn)) { if(connection_speaks_cells(conn)) {
if(conn->state == OR_CONN_STATE_OPEN) { if(conn->state == OR_CONN_STATE_OPEN) {
@ -329,8 +331,8 @@ static void conn_close_if_marked(int i) {
return; return;
} }
if(connection_wants_to_flush(conn)) { if(connection_wants_to_flush(conn)) {
log_fn(LOG_WARN,"Conn (fd %d, type %s, state %d) still wants to flush. Losing %d bytes! (Marked at %s:%d)", log_fn(LOG_WARN,"Conn (addr %s, fd %d, type %s, state %d) still wants to flush. Losing %d bytes! (Marked at %s:%d)",
conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state, inet_ntoa(in), conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state,
(int)buf_datalen(conn->outbuf), conn->marked_for_close_file, (int)buf_datalen(conn->outbuf), conn->marked_for_close_file,
conn->marked_for_close); conn->marked_for_close);
} }