Commit d2768947 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

I think it is correct to decorate these addresses.

parent 6e27282d
......@@ -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);
......
......@@ -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;
......
......@@ -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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment