aboutsummaryrefslogtreecommitdiff
path: root/src/or/transports.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2012-10-04 20:48:56 -0400
committerNick Mathewson <nickm@torproject.org>2012-10-09 23:49:56 -0400
commit634d24c58815a8754fb94f9abc0edc2aa8ba5a80 (patch)
tree175850d81d0a91d4dc3a9de4b3bbc1bcf39a3a4e /src/or/transports.c
parenta01736e8b2017f313f178503bf55e8e7f15a7d39 (diff)
downloadtor-634d24c58815a8754fb94f9abc0edc2aa8ba5a80.tar
tor-634d24c58815a8754fb94f9abc0edc2aa8ba5a80.tar.gz
Don't call fmt_addr() twice in a parameter list.
Diffstat (limited to 'src/or/transports.c')
-rw-r--r--src/or/transports.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/transports.c b/src/or/transports.c
index 34fe679dd..f9cd12561 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -270,19 +270,22 @@ 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));
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, fmt_addr(&t->addr), t->port,
+ "new one.", t->name, new_transport_addr, t->port,
fmt_addr(&t_tmp->addr), t_tmp->port);
smartlist_remove(transport_list, t_tmp);
transport_free(t_tmp);
+ tor_free(new_transport_addr);
} else { /* *not* marked for removal */
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, fmt_addr(&t->addr), t->port,
+ "Skipping.", t->name, new_transport_addr, t->port,
fmt_addr(&t_tmp->addr), t_tmp->port);
+ tor_free(new_transport_addr);
return -1;
}
}