mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 21:53:48 +01:00
28cf9f2186
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>
71 lines
2.9 KiB
C
71 lines
2.9 KiB
C
/* Copyright (c) 2001 Matej Pfajfar.
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
|
* Copyright (c) 2007-2015, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
/**
|
|
* \file rendcommon.h
|
|
* \brief Header file for rendcommon.c.
|
|
**/
|
|
|
|
#ifndef TOR_RENDCOMMON_H
|
|
#define TOR_RENDCOMMON_H
|
|
|
|
/** Free all storage associated with <b>data</b> */
|
|
static INLINE void
|
|
rend_data_free(rend_data_t *data)
|
|
{
|
|
tor_free(data);
|
|
}
|
|
|
|
int rend_cmp_service_ids(const char *one, const char *two);
|
|
|
|
void rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint,
|
|
int command, size_t length,
|
|
const uint8_t *payload);
|
|
|
|
void rend_service_descriptor_free(rend_service_descriptor_t *desc);
|
|
int rend_get_service_id(crypto_pk_t *pk, char *out);
|
|
void rend_encoded_v2_service_descriptor_free(
|
|
rend_encoded_v2_service_descriptor_t *desc);
|
|
void rend_intro_point_free(rend_intro_point_t *intro);
|
|
|
|
void rend_cache_init(void);
|
|
void rend_cache_clean(time_t now);
|
|
void rend_cache_clean_v2_descs_as_dir(time_t now, size_t min_to_remove);
|
|
void rend_cache_purge(void);
|
|
void rend_cache_free_all(void);
|
|
int rend_valid_service_id(const char *query);
|
|
int rend_cache_lookup_entry(const char *query, int version,
|
|
rend_cache_entry_t **entry_out);
|
|
int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc);
|
|
/** Return value from rend_cache_store_v2_desc_as_{dir,client}. */
|
|
typedef enum {
|
|
RCS_NOTDIR = -2, /**< We're not a directory */
|
|
RCS_BADDESC = -1, /**< This descriptor is no good. */
|
|
RCS_OKAY = 0 /**< All worked as expected */
|
|
} rend_cache_store_status_t;
|
|
|
|
rend_cache_store_status_t rend_cache_store_v2_desc_as_dir(const char *desc);
|
|
rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc,
|
|
const char *desc_id_base32,
|
|
const rend_data_t *rend_query,
|
|
rend_cache_entry_t **entry);
|
|
int rend_encode_v2_descriptors(smartlist_t *descs_out,
|
|
rend_service_descriptor_t *desc, time_t now,
|
|
uint8_t period, rend_auth_type_t auth_type,
|
|
crypto_pk_t *client_key,
|
|
smartlist_t *client_cookies);
|
|
int rend_compute_v2_desc_id(char *desc_id_out, const char *service_id,
|
|
const char *descriptor_cookie,
|
|
time_t now, uint8_t replica);
|
|
int rend_id_is_in_interval(const char *a, const char *b, const char *c);
|
|
void rend_get_descriptor_id_bytes(char *descriptor_id_out,
|
|
const char *service_id,
|
|
const char *secret_id_part);
|
|
size_t rend_cache_get_total_allocation(void);
|
|
|
|
#endif
|
|
|