summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-12-06 07:21:17 +0000
committerRoger Dingledine <arma@torproject.org>2005-12-06 07:21:17 +0000
commit3347762fa4402e752e1db3a03a5ae8d492b6b09b (patch)
tree118adfcadce784d9e03c568cb326970aba50e007
parentb1d034d2abb20f218b8d4af1219f0cc0e1212fec (diff)
downloadtor-3347762fa4402e752e1db3a03a5ae8d492b6b09b.tar.gz
tor-3347762fa4402e752e1db3a03a5ae8d492b6b09b.zip
when we're giving up on a circuit and retrying on a new one,
log the name of the exit node. perhaps people will find this useful, or see patterns, or something. svn:r5515
-rw-r--r--src/or/connection_edge.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 786f2dbae0..bf3f2ff848 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -314,6 +314,7 @@ connection_ap_expire_beginning(void)
connection_t **carray;
connection_t *conn;
circuit_t *circ;
+ const char *nickname;
int n, i;
time_t now = time(NULL);
or_options_t *options = get_options();
@@ -355,9 +356,11 @@ connection_ap_expire_beginning(void)
continue;
}
tor_assert(circ->purpose == CIRCUIT_PURPOSE_C_GENERAL);
- notice(LD_APP,"We tried for %d seconds to connect to '%s'. Retrying on a new circuit.",
+ nickname = build_state_get_exit_nickname(circ->build_state);
+ notice(LD_APP,"We tried for %d seconds to connect to '%s' using exit '%s'. Retrying on a new circuit.",
(int)(now - conn->timestamp_lastread),
- safe_str(conn->socks_request->address));
+ safe_str(conn->socks_request->address),
+ nickname ? nickname : "*unnamed*");
/* send an end down the circuit */
connection_edge_end(conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer);
/* un-mark it as ending, since we're going to reuse it */