[tor-commits] [tor/master] Use fmt_and_decorate_addr in extra-info "transport" lines.

nickm at torproject.org nickm at torproject.org
Thu Oct 11 02:32:44 UTC 2012


commit 4b0a039cb83f1780a8532a46b2529ff0a580c902
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Oct 10 17:11:03 2012 -0700

    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.
---
 src/or/transports.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/transports.c b/src/or/transports.c
index cf3ef39..ed4a295 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(),





More information about the tor-commits mailing list