diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-04-23 12:24:35 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-04-23 12:24:35 -0400 |
commit | 54000d7ad9fc92136981da7c270e0646a5288bf3 (patch) | |
tree | c73d7ac40a660eb03c5814565993d6880d12937b /src/or/rendcommon.h | |
parent | 9a81ed1d238e952429a53e7b38a4b6dd4bc5554a (diff) | |
parent | 6f5f38a0bc60d3be9b6cf02e29b9065869cf6af8 (diff) | |
download | tor-54000d7ad9fc92136981da7c270e0646a5288bf3.tar.gz tor-54000d7ad9fc92136981da7c270e0646a5288bf3.zip |
Merge remote-tracking branch 'dgoulet/bug14847_027_06'
Diffstat (limited to 'src/or/rendcommon.h')
-rw-r--r-- | src/or/rendcommon.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 8396cc3551..b86cdb7fa6 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -37,6 +37,7 @@ 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_valid_descriptor_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); @@ -50,7 +51,8 @@ typedef enum { 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); + 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, |