nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Print the correct address family in log printout.

Browse Source 
Look at the address family of the preferred OR port rather than the
node.ipv6_preferred flag since the logic has changed with new
ClientUseIPv6 config option.

Fixes ticket 6884.
This commit is contained in:
Linus Nordberg 2012-09-18 14:41:14 +02:00
parent 5dfec9f833
commit a989dbc3dc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/6884 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (client):
- Correct log printout about which address family is preferred
when connecting to a bridge with both an IPv4 and IPv6 OR port.
Fixes bug 6884.

2
src/or/circuitbuild.c
View File

@ -5641,7 +5641,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
"Bridge '%s' has both an IPv4 and an IPv6 address. " "Bridge '%s' has both an IPv4 and an IPv6 address. "
"Will prefer using its %s address (%s:%d).", "Will prefer using its %s address (%s:%d).",
ri->nickname, ri->nickname,
node->ipv6_preferred ? "IPv6" : "IPv4", tor_addr_family(&ap.addr) == AF_INET6 ? "IPv6" : "IPv4",
fmt_addr(&ap.addr), ap.port); fmt_addr(&ap.addr), ap.port);
} }
} }