aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.h
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@ev0ke.net>2015-03-11 14:52:28 -0400
committerDavid Goulet <dgoulet@ev0ke.net>2015-04-21 14:22:54 -0400
commit28cf9f2186a96bba74b0870b95a9fa1630305388 (patch)
tree6cb72af857cfeedb5ac200dece63581af4cb95be /src/or/control.h
parent59f8dced114f20a147a5425ece67d7d44a81867b (diff)
downloadtor-28cf9f2186a96bba74b0870b95a9fa1630305388.tar.gz
tor-28cf9f2186a96bba74b0870b95a9fa1630305388.zip
Control: unbolt rend_data from HS desc event
The HS_DESC event was using rend_data_t from the dir connection to reply the onion address and authentication type. With the new HSFETCH command, it's now possible to fetch a descriptor only using the descriptor id thus resulting in not having an onion address in any HS_DESC event. This patch removes rend_query from the hs desc control functions and replace it by an onion address string and an auth type. On a successful fetch, the service id is taken from the fetched descriptor. For that, an extra parameter is added to "store as a client" function that contains the cache entry stored. This will make the control event functions scale more easily over time if other values not present in rend_data_t are needed since the rend_data from the dir connection might not contained everything we need. Signed-off-by: David Goulet <dgoulet@ev0ke.net>
Diffstat (limited to 'src/or/control.h')
-rw-r--r--src/or/control.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/or/control.h b/src/or/control.h
index ae49284965..93bcb8ef3d 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -107,13 +107,16 @@ void control_event_hs_descriptor_requested(const rend_data_t *rend_query,
const char *desc_id_base32,
const char *hs_dir);
void control_event_hs_descriptor_receive_end(const char *action,
- const rend_data_t *rend_query,
- const char *hs_dir,
- const char *reason);
-void control_event_hs_descriptor_received(const rend_data_t *rend_query,
- const char *hs_dir);
-void control_event_hs_descriptor_failed(const rend_data_t *rend_query,
- const char *hs_dir,
+ const char *onion_address,
+ rend_auth_type_t auth_type,
+ const char *id_digest,
+ const char *reason);
+void control_event_hs_descriptor_received(const char *onion_address,
+ rend_auth_type_t auth_type,
+ const char *id_digest);
+void control_event_hs_descriptor_failed(const char *onion_address,
+ rend_auth_type_t auth_type,
+ const char *id_digest,
const char *reason);
void control_event_hs_descriptor_content(const char *onion_address,
const char *desc_id,