From: David Fifield <david@bamsoftware.com>
Date: Thu, 11 Oct 2012 00:11:03 +0000 (-0700)
Subject: Use fmt_and_decorate_addr in extra-info "transport" lines.
X-Git-Tag: tor-0.2.4.4-alpha~36^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b0a039cb83f1780a8532a46b2529ff0a580c902;p=thirdparty%2Ftor.git

Use fmt_and_decorate_addr in extra-info "transport" lines.

Apparently BridgeDB is already expecting transport lines to be formatted
thus; see https://trac.torproject.org/projects/tor/ticket/7011#comment:12 ff.
It may be that there are no extant IPv6 pluggable transport bridges yet,
so this didn't cause a problem.
---

diff --git a/src/or/transports.c b/src/or/transports.c
index cf3ef3957b..ed4a295c72 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -1382,7 +1382,7 @@ pt_get_extra_info_descriptor_string(void)
       /* If the transport proxy returned "0.0.0.0" as its address, and
        * we know our external IP address, use it. Otherwise, use the
        * returned address. */
-      const char *addr_str = fmt_addr(&t->addr);
+      const char *addr_str = fmt_and_decorate_addr(&t->addr);
       uint32_t external_ip_address = 0;
       if (tor_addr_is_null(&t->addr) &&
           router_pick_published_address(get_options(),