summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2016-03-24 20:59:49 +1100
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2016-03-24 20:59:49 +1100
commit355f78364a7d1fa3c2de0a93e68153ae65526e02 (patch)
tree727e3dd3227bf83c48eb0569dbfcb82bac927c8a /src/or/connection.c
parentf2a344e3974eeba860434884bd70f8d11cca94ea (diff)
downloadtor-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/connection.c')
-rw-r--r--src/or/connection.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index fc9ec13c41..82fc1ba8b7 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1794,7 +1794,7 @@ connection_connect_log_client_use_ip_version(const connection_t *conn)
if ((must_ipv4 && tor_addr_family(&real_addr) == AF_INET6)
|| (must_ipv6 && tor_addr_family(&real_addr) == AF_INET)) {
static int logged_backtrace = 0;
- log_info(LD_BUG, "%s connection to %s violated ClientUseIPv%s 0.",
+ log_info(LD_BUG, "Outgoing %s connection to %s violated ClientUseIPv%s 0.",
conn->type == CONN_TYPE_OR ? "OR" : "Dir",
fmt_addr(&real_addr),
options->ClientUseIPv4 == 0 ? "4" : "6");
@@ -1814,9 +1814,10 @@ connection_connect_log_client_use_ip_version(const connection_t *conn)
/* Check if we couldn't satisfy an address family preference */
if ((!pref_ipv6 && tor_addr_family(&real_addr) == AF_INET6)
|| (pref_ipv6 && tor_addr_family(&real_addr) == AF_INET)) {
- log_info(LD_NET, "Connection to %s doesn't satisfy ClientPreferIPv6%sPort "
- "%d, with ClientUseIPv4 %d, and fascist_firewall_use_ipv6 %d "
- "(ClientUseIPv6 %d and UseBridges %d).",
+ log_info(LD_NET, "Outgoing connection to %s doesn't satisfy "
+ "ClientPreferIPv6%sPort %d, with ClientUseIPv4 %d, and "
+ "fascist_firewall_use_ipv6 %d (ClientUseIPv6 %d and UseBridges "
+ "%d).",
fmt_addr(&real_addr),
conn->type == CONN_TYPE_OR ? "OR" : "Dir",
conn->type == CONN_TYPE_OR ? options->ClientPreferIPv6ORPort