nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

log: Don't use twice fmt_addr() in same logging statement

Browse Source 
Fixes #40059

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2020-07-22 11:09:21 -04:00
parent a4c5b7d742
commit 6de860497e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/dirclient/dirclient.c
View File

@ -686,12 +686,14 @@ directory_choose_address_routerstatus(const routerstatus_t *status,
* connect to it. */ * connect to it. */
if (!have_or && !have_dir) { if (!have_or && !have_dir) {
static int logged_backtrace = 0; static int logged_backtrace = 0;
char *ipv6_str = tor_addr_to_str_dup(&status->ipv6_addr);
log_info(LD_BUG, "Rejected all OR and Dir addresses from %s when " log_info(LD_BUG, "Rejected all OR and Dir addresses from %s when "
"launching an outgoing directory connection to: IPv4 %s OR %d " "launching an outgoing directory connection to: IPv4 %s OR %d "
"Dir %d IPv6 %s OR %d Dir %d", routerstatus_describe(status), "Dir %d IPv6 %s OR %d Dir %d", routerstatus_describe(status),
fmt_addr(&status->ipv4_addr), status->ipv4_orport, fmt_addr(&status->ipv4_addr), status->ipv4_orport,
status->ipv4_dirport, fmt_addr(&status->ipv6_addr), status->ipv4_dirport, ipv6_str, status->ipv6_orport,
status->ipv6_orport, status->ipv4_dirport); status->ipv4_dirport);
tor_free(ipv6_str);
if (!logged_backtrace) { if (!logged_backtrace) {
log_backtrace(LOG_INFO, LD_BUG, "Addresses came from"); log_backtrace(LOG_INFO, LD_BUG, "Addresses came from");
logged_backtrace = 1; logged_backtrace = 1;