]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Use fmt_and_decorate_addr in extra-info "transport" lines.
authorDavid Fifield <david@bamsoftware.com>
Thu, 11 Oct 2012 00:11:03 +0000 (17:11 -0700)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Oct 2012 02:25:29 +0000 (22:25 -0400)
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.

src/or/transports.c

index cf3ef3957b89a752ee757472ffa9ddfbb1cb8bfb..ed4a295c72c62e76961cd11310764c53ba197d6e 100644 (file)
@@ -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(),