diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-03-24 09:33:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-24 09:33:58 -0400 |
| commit | 54559e5845f42c51600b80de6b67467627451fcb (patch) | |
| tree | e401a2ff21c6e8b74401e57d1acfbd57c59876bc /src/or/connection.c | |
| parent | ea9472d085b1344eb3abc3f9e644beff184cbce3 (diff) | |
| parent | 355f78364a7d1fa3c2de0a93e68153ae65526e02 (diff) | |
| download | tor-54559e5845f42c51600b80de6b67467627451fcb.tar.gz tor-54559e5845f42c51600b80de6b67467627451fcb.zip | |
Merge remote-tracking branch 'teor/bug18351'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 9c8dcdebb9..118e239176 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1802,11 +1802,15 @@ connection_connect_log_client_use_ip_version(const connection_t *conn) /* Check if we broke a mandatory address family restriction */ if ((must_ipv4 && tor_addr_family(&real_addr) == AF_INET6) || (must_ipv6 && tor_addr_family(&real_addr) == AF_INET)) { - log_warn(LD_BUG, "%s connection to %s violated ClientUseIPv%s 0.", + static int logged_backtrace = 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"); - log_backtrace(LOG_WARN, LD_BUG, "Address came from"); + if (!logged_backtrace) { + log_backtrace(LOG_INFO, LD_BUG, "Address came from"); + logged_backtrace = 1; + } } /* Bridges are allowed to break IPv4/IPv6 ORPort preferences to connect to @@ -1819,9 +1823,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 |