aboutsummaryrefslogtreecommitdiff
path: root/src/or/transports.c
diff options
context:
space:
mode:
authorDavid Fifield <david@bamsoftware.com>2012-10-06 20:30:58 -0700
committerNick Mathewson <nickm@torproject.org>2012-10-10 22:25:29 -0400
commit34c6ee7e9b62ffb4ef62c7195f6e69db084172df (patch)
treed1ade6fc92990da791547f813bd369becffdc004 /src/or/transports.c
parentec97319464aab204740acb013b504abb0e13d989 (diff)
downloadtor-34c6ee7e9b62ffb4ef62c7195f6e69db084172df.tar
tor-34c6ee7e9b62ffb4ef62c7195f6e69db084172df.tar.gz
Use fmt_and_decorate_addr in log messages.
Diffstat (limited to 'src/or/transports.c')
-rw-r--r--src/or/transports.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/transports.c b/src/or/transports.c
index f9cd12561..cf3ef3957 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -270,13 +270,13 @@ transport_resolve_conflicts(const transport_t *t)
t_tmp->marked_for_removal = 0;
return 1;
} else { /* same name but different addrport */
- char *new_transport_addr = tor_strdup(fmt_addr(&t->addr));
+ char *new_transport_addr = tor_strdup(fmt_and_decorate_addr(&t->addr));
if (t_tmp->marked_for_removal) { /* marked for removal */
log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' "
"but there was already a transport marked for deletion at "
"'%s:%u'. We deleted the old transport and registered the "
"new one.", t->name, new_transport_addr, t->port,
- fmt_addr(&t_tmp->addr), t_tmp->port);
+ fmt_and_decorate_addr(&t_tmp->addr), t_tmp->port);
smartlist_remove(transport_list, t_tmp);
transport_free(t_tmp);
tor_free(new_transport_addr);
@@ -284,7 +284,7 @@ transport_resolve_conflicts(const transport_t *t)
log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' "
"but the same transport already exists at '%s:%u'. "
"Skipping.", t->name, new_transport_addr, t->port,
- fmt_addr(&t_tmp->addr), t_tmp->port);
+ fmt_and_decorate_addr(&t_tmp->addr), t_tmp->port);
tor_free(new_transport_addr);
return -1;
}
@@ -333,17 +333,17 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port,
case -1:
default:
log_notice(LD_GENERAL, "Could not add transport %s at %s:%u. Skipping.",
- t->name, fmt_addr(&t->addr), t->port);
+ t->name, fmt_and_decorate_addr(&t->addr), t->port);
transport_free(t);
return -1;
case 1:
log_info(LD_GENERAL, "Succesfully registered transport %s at %s:%u.",
- t->name, fmt_addr(&t->addr), t->port);
+ t->name, fmt_and_decorate_addr(&t->addr), t->port);
transport_free(t); /* falling */
return 0;
case 0:
log_info(LD_GENERAL, "Succesfully registered transport %s at %s:%u.",
- t->name, fmt_addr(&t->addr), t->port);
+ t->name, fmt_and_decorate_addr(&t->addr), t->port);
return 0;
}
}
@@ -645,7 +645,7 @@ register_server_proxy(const managed_proxy_t *mp)
SMARTLIST_FOREACH_BEGIN(mp->transports, transport_t *, t) {
save_transport_to_state(t->name, &t->addr, t->port);
log_notice(LD_GENERAL, "Registered server transport '%s' at '%s:%d'",
- t->name, fmt_addr(&t->addr), (int)t->port);
+ t->name, fmt_and_decorate_addr(&t->addr), (int)t->port);
} SMARTLIST_FOREACH_END(t);
}