diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-07-10 17:14:51 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-07-10 17:14:51 +0000 |
| commit | 74711479eb22faf146b579e1856b37ee4a5afc8b (patch) | |
| tree | b7efda701936d0bdc29ade77fb4dd20eef1f085c /src/or/relay.c | |
| parent | 77053147771164dd53c78bef1d27fb2be180eb5d (diff) | |
| download | tor-74711479eb22faf146b579e1856b37ee4a5afc8b.tar.gz tor-74711479eb22faf146b579e1856b37ee4a5afc8b.zip | |
r13666@catbus: nickm | 2007-07-10 13:10:00 -0400
Get the RESOLVE controller code working.
svn:r10781
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 0a34687d6c..2bcd400453 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -759,7 +759,8 @@ connection_edge_process_end_not_open( } /* rewrite it to an IP if we learned one. */ if (addressmap_rewrite(conn->socks_request->address, - sizeof(conn->socks_request->address))) { + sizeof(conn->socks_request->address), + NULL)) { control_event_stream_status(conn, STREAM_EVENT_REMAP, 0); } if (conn->_base.chosen_exit_optional) { @@ -946,7 +947,8 @@ connection_edge_process_relay_cell_not_open( answer_type, cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/ cell->payload+RELAY_HEADER_SIZE+2, /*answer*/ - ttl); + ttl, + -1); if (answer_type == RESOLVED_TYPE_IPV4) { uint32_t addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2)); remap_event_helper(conn, addr); |