I think it is correct to decorate these addresses.

diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 45e29c18567026274e77d86065ba5b4ea805eab1..75cfca64424813d385f3311a4d0691201443a81c 100644 (file)
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -636,7 +636,7 @@ client_dns_set_addressmap(origin_circuit_t *on_circ,
   if (tor_addr_family(val) != AF_INET)
     return;
 
-  if (! tor_addr_to_str(valbuf, val, sizeof(valbuf), 0)) /* XXXX decorate? */
+  if (! tor_addr_to_str(valbuf, val, sizeof(valbuf), 1))
     return;
 
   client_dns_set_addressmap_impl(on_circ, address, valbuf, exitname, ttl);

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index c14e116706275d25f74bfe38209076e47a0f61d1..1dd1dbc4d41c61a8b5d9c64f22255c5feb74efe1 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1344,7 +1344,7 @@ connection_ap_get_original_destination(entry_connection_t *conn,
   }
 
   tor_addr_from_sockaddr(&addr, (struct sockaddr*)&orig_dst, &req->port);
-  tor_addr_to_str(req->address, &addr, sizeof(req->address), 0);
+  tor_addr_to_str(req->address, &addr, sizeof(req->address), 1);
 
   return 0;
 #elif defined(TRANS_PF)
@@ -1405,7 +1405,7 @@ connection_ap_get_original_destination(entry_connection_t *conn,
     return -1;
   }
 
-  tor_addr_to_str(req->address, &addr, sizeof(req->address), 0);
+  tor_addr_to_str(req->address, &addr, sizeof(req->address), 1);
   req->port = ntohs(pnl.rdport);
 
   return 0;

diff --git a/src/or/relay.c b/src/or/relay.c
index a05e955ecd332ee001395b83edd4ff1acbfbcf63..e01d933f0561fcb051f81bcbc268981290d157e6 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -853,7 +853,7 @@ remap_event_helper(entry_connection_t *conn, const tor_addr_t *new_addr)
 {
   tor_addr_to_str(conn->socks_request->address, new_addr,
                   sizeof(conn->socks_request->address),
-                  0); /* XXXXX Should decorate be 1? */
+                  1);
   control_event_stream_status(conn, STREAM_EVENT_REMAP,
                               REMAP_STREAM_SOURCE_EXIT);
 }