diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 21:58:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 21:58:46 -0400 |
| commit | b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb (patch) | |
| tree | d60ca6da0feb52fc330ffa88ff871e6c35781e63 /src/or/circuitlist.c | |
| parent | ede102fd4675af8ac4060767f0348f3c93617e80 (diff) | |
| download | tor-b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb.tar.gz tor-b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb.zip | |
Log descriptions of nodes, not just nicknames.
This patch introduces a few new functions in router.c to produce a
more helpful description of a node than its nickame, and then tweaks
nearly all log messages taking a nickname as an argument to call these
functions instead.
There are a few cases where I left the old log messages alone: in
these cases, the nickname was that of an authority (whose nicknames
are useful and unique), or the message already included an identity
and/or an address. I might have missed a couple more too.
This is a fix for bug 3045.
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8ec46186d9..4ad244dfda 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -274,8 +274,10 @@ circuit_count_pending_on_or_conn(or_connection_t *or_conn) circuit_get_all_pending_on_or_conn(sl, or_conn); cnt = smartlist_len(sl); smartlist_free(sl); - log_debug(LD_CIRC,"or_conn to %s, %d pending circs", - or_conn->nickname ? or_conn->nickname : "NULL", cnt); + log_debug(LD_CIRC,"or_conn to %s at %s, %d pending circs", + or_conn->nickname ? or_conn->nickname : "NULL", + or_conn->_base.address, + cnt); return cnt; } |