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/routerparse.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/routerparse.c')
-rw-r--r-- | src/or/routerparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 389f22fd99..a877cdff84 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1210,7 +1210,8 @@ router_parse_list_from_string(const char **s, const char *eos, prepend_annotations); if (router) { log_debug(LD_DIR, "Read router '%s', purpose '%s'", - router->nickname, router_purpose_to_string(router->purpose)); + router_describe(router), + router_purpose_to_string(router->purpose)); signed_desc = &router->cache_info; elt = router; } @@ -2488,7 +2489,7 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) } } else { log_warn(LD_BUG, "Missing consensus bandwidth for router %s", - rs->nickname); + routerstatus_describe(rs)); } } SMARTLIST_FOREACH_END(rs); |