diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-16 14:50:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-16 14:50:53 -0400 |
| commit | 03ccce6d776c617d81837ae9cc1f33f45d154e92 (patch) | |
| tree | a85fb96f4f6c5908968649ca883664a6f78284e2 /src/or/directory.c | |
| parent | e423447f53f3a1b3b72cea3e52f345143e847d48 (diff) | |
| parent | e908e3a332dd469af2facac0846d0dc8349a30d3 (diff) | |
| download | tor-03ccce6d776c617d81837ae9cc1f33f45d154e92.tar.gz tor-03ccce6d776c617d81837ae9cc1f33f45d154e92.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index e62c2f3f0f..9983a97a7f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2108,7 +2108,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) (int)body_len, status_code, escaped(reason)); switch (status_code) { case 200: - if (rend_cache_store(body, body_len, 0) < -1) { + if (rend_cache_store(body, body_len, 0, + conn->rend_data->onion_address) < -1) { log_warn(LD_REND,"Failed to parse rendezvous descriptor."); /* Any pending rendezvous attempts will notice when * connection_about_to_close_connection() @@ -3376,7 +3377,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, !strcmpstart(url,"/tor/rendezvous/publish")) { /* rendezvous descriptor post */ log_info(LD_REND, "Handling rendezvous descriptor post."); - if (rend_cache_store(body, body_len, 1) < 0) { + if (rend_cache_store(body, body_len, 1, NULL) < 0) { log_fn(LOG_PROTOCOL_WARN, LD_DIRSERV, "Rejected rend descriptor (length %d) from %s.", (int)body_len, conn->_base.address); |