aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorDavid Fifield <david@bamsoftware.com>2012-10-06 21:25:25 -0700
committerNick Mathewson <nickm@torproject.org>2012-10-10 22:25:30 -0400
commit8419d184411e8cd9457346a7a3d5f9734211a8b2 (patch)
treed97f5e28e33089a948ca958253bdd86aa9b3ab13 /src/or/connection_or.c
parent78e2d8c7a85c8ec2defe5d1873ae19ba9b82b14c (diff)
downloadtor-8419d184411e8cd9457346a7a3d5f9734211a8b2.tar.gz
tor-8419d184411e8cd9457346a7a3d5f9734211a8b2.zip
Use fmt_addrport where appropriate.
This is mostly a conversion from this pattern: log("... %s:%d ...", fmt_and_decorate_addr(&addr), port); to this: log("... %s ...", fmt_addrport(&addr, port)); The output is the same in all cases.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 04cbf40834..06b1268818 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1084,19 +1084,17 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
TO_CONN(conn)->port);
if (transport_name) {
- log_warn(LD_GENERAL, "We were supposed to connect to bridge '%s:%u' "
+ log_warn(LD_GENERAL, "We were supposed to connect to bridge '%s' "
"using pluggable transport '%s', but we can't find a pluggable "
"transport proxy supporting '%s'. This can happen if you "
"haven't provided a ClientTransportPlugin line, or if "
"your pluggable transport proxy stopped running.",
- fmt_and_decorate_addr(&TO_CONN(conn)->addr),
- TO_CONN(conn)->port,
+ fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port),
transport_name, transport_name);
} else {
- log_warn(LD_GENERAL, "Tried to connect to '%s:%u' through a proxy, but "
+ log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but "
"the proxy address could not be found.",
- fmt_and_decorate_addr(&TO_CONN(conn)->addr),
- TO_CONN(conn)->port);
+ fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port));
}
connection_free(TO_CONN(conn));