mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 21:16:22 +02:00
control: Support HS v3 for CIRC and CIRC_MINOR event
"REND_QUERY=" can now output a v3 address. Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
parent
13bb4f60f0
commit
cc26d4fa21
@ -2678,9 +2678,16 @@ circuit_describe_status_for_controller(origin_circuit_t *circ)
|
||||
}
|
||||
}
|
||||
|
||||
if (circ->rend_data != NULL) {
|
||||
smartlist_add_asprintf(descparts, "REND_QUERY=%s",
|
||||
rend_data_get_address(circ->rend_data));
|
||||
if (circ->rend_data != NULL || circ->hs_ident != NULL) {
|
||||
char addr[HS_SERVICE_ADDR_LEN_BASE32 + 1];
|
||||
const char *onion_address;
|
||||
if (circ->rend_data) {
|
||||
onion_address = rend_data_get_address(circ->rend_data);
|
||||
} else {
|
||||
hs_build_address(&circ->hs_ident->identity_pk, HS_VERSION_THREE, addr);
|
||||
onion_address = addr;
|
||||
}
|
||||
smartlist_add_asprintf(descparts, "REND_QUERY=%s", onion_address);
|
||||
}
|
||||
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user