summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@ev0ke.net>2015-04-30 12:28:11 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-14 10:46:38 -0400
commitc1ffeadff4db375886d40bb5928ddd4fe761ba9f (patch)
treea1911a7d1b60a6908f506f96604f51c90fb8c57b /src/or/directory.c
parent95a9920461dd3322280a13c8d99e363c91028ab2 (diff)
downloadtor-c1ffeadff4db375886d40bb5928ddd4fe761ba9f.tar.gz
tor-c1ffeadff4db375886d40bb5928ddd4fe761ba9f.zip
Add missing descriptor ID to HS_DESC control event
For FAILED and RECEIVED action of the HS_DESC event, we now sends back the descriptor ID at the end like specified in the control-spec section 4.1.25. Fixes #15881 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 85da97fce1..9fe3052774 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2099,8 +2099,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
if (conn->base_.purpose == DIR_PURPOSE_FETCH_RENDDESC_V2) {
#define SEND_HS_DESC_FAILED_EVENT(reason) ( \
- control_event_hs_descriptor_failed(conn->rend_data->onion_address, \
- conn->rend_data->auth_type, \
+ control_event_hs_descriptor_failed(conn->rend_data, \
conn->identity_digest, \
reason) )
#define SEND_HS_DESC_FAILED_CONTENT() ( \
@@ -2141,7 +2140,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
log_info(LD_REND, "Successfully fetched v2 rendezvous "
"descriptor.");
control_event_hs_descriptor_received(service_id,
- conn->rend_data->auth_type,
+ conn->rend_data,
conn->identity_digest);
control_event_hs_descriptor_content(service_id,
conn->requested_resource,