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/relay.c | |
| parent | ede102fd4675af8ac4060767f0348f3c93617e80 (diff) | |
| download | tor-b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb.tar tor-b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb.tar.gz | |
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/relay.c')
| -rw-r--r-- | src/or/relay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 9effae303..46e852217 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -28,6 +28,7 @@ #include "reasons.h" #include "relay.h" #include "rendcommon.h" +#include "router.h" #include "routerlist.h" #include "routerparse.h" @@ -749,9 +750,9 @@ connection_ap_process_end_not_open( (tor_inet_aton(conn->socks_request->address, &in) && !conn->chosen_exit_name))) { log_info(LD_APP, - "Exitrouter '%s' seems to be more restrictive than its exit " + "Exitrouter %s seems to be more restrictive than its exit " "policy. Not using this router as exit for now.", - exitrouter->nickname); + router_describe(exitrouter)); policies_set_router_exitpolicy_to_reject_all(exitrouter); } /* rewrite it to an IP if we learned one. */ |