diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-03-24 20:59:49 +1100 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-03-24 20:59:49 +1100 |
| commit | 355f78364a7d1fa3c2de0a93e68153ae65526e02 (patch) | |
| tree | 727e3dd3227bf83c48eb0569dbfcb82bac927c8a /src/or/directory.c | |
| parent | f2a344e3974eeba860434884bd70f8d11cca94ea (diff) | |
| download | tor-355f78364a7d1fa3c2de0a93e68153ae65526e02.tar.gz tor-355f78364a7d1fa3c2de0a93e68153ae65526e02.zip | |
Clarify ReachableAddress log messages
Make it clearer that they are about outgoing connection attempts.
Specify the options involved where they were missing from one log
message.
Clarify a comment.
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index c95944b6f2..7f307267e3 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -672,12 +672,13 @@ directory_choose_address_routerstatus(const routerstatus_t *status, FIREWALL_DIR_CONNECTION, 0, use_dir_ap); - /* We rejected both addresses. This isn't great. */ + /* We rejected all addresses in the relay's status. This means we can't + * connect to it. */ if (!have_or && !have_dir) { static int logged_backtrace = 0; log_info(LD_BUG, "Rejected all OR and Dir addresses from %s when " - "launching a directory connection to: IPv4 %s OR %d Dir %d " - "IPv6 %s OR %d Dir %d", routerstatus_describe(status), + "launching an outgoing directory connection to: IPv4 %s OR %d " + "Dir %d IPv6 %s OR %d Dir %d", routerstatus_describe(status), fmt_addr32(status->addr), status->or_port, status->dir_port, fmt_addr(&status->ipv6_addr), status->ipv6_orport, status->dir_port); @@ -1105,7 +1106,8 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, if (or_connection && (!or_addr_port->port || tor_addr_is_null(&or_addr_port->addr))) { static int logged_backtrace = 0; - log_warn(LD_DIR, "Cannot make an OR connection without an OR port."); + log_warn(LD_DIR, "Cannot make an outgoing OR connection without an OR " + "port."); if (!logged_backtrace) { log_backtrace(LOG_INFO, LD_BUG, "Address came from"); logged_backtrace = 1; @@ -1114,7 +1116,8 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, } else if (!or_connection && (!dir_addr_port->port || tor_addr_is_null(&dir_addr_port->addr))) { static int logged_backtrace = 0; - log_warn(LD_DIR, "Cannot make a Dir connection without a Dir port."); + log_warn(LD_DIR, "Cannot make an outgoing Dir connection without a Dir " + "port."); if (!logged_backtrace) { log_backtrace(LOG_INFO, LD_BUG, "Address came from"); logged_backtrace = 1; |