diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-31 22:18:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-14 23:16:24 -0500 |
| commit | d276894772cc1ed2cfdcbeb6efd96b1abca3f2dc (patch) | |
| tree | 01b2bf1163881ee11d9d5cf9bb392e2ffbece251 | |
| parent | 6e27282dab8f4d4999830f0310ea3f8aa75c6b63 (diff) | |
| download | tor-d276894772cc1ed2cfdcbeb6efd96b1abca3f2dc.tar.gz tor-d276894772cc1ed2cfdcbeb6efd96b1abca3f2dc.zip | |
I think it is correct to decorate these addresses.
| -rw-r--r-- | src/or/addressmap.c | 2 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 4 | ||||
| -rw-r--r-- | src/or/relay.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 45e29c1856..75cfca6442 100644 --- 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 c14e116706..1dd1dbc4d4 100644 --- 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 a05e955ecd..e01d933f05 100644 --- 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); } |