Revert r13301 and part of r13304. I guess nick's svk messed up.

svn:r13305
This commit is contained in:
Roger Dingledine 2008-01-27 01:03:30 +00:00
parent 68cf666d04
commit 6dfd2f531c
3 changed files with 2 additions and 6 deletions

View File

@ -3030,10 +3030,6 @@ int dir_split_resource_into_fingerprints(const char *resource,
char *directory_dump_request_log(void); char *directory_dump_request_log(void);
int router_supports_extrainfo(const char *identity_digest, int is_authority); int router_supports_extrainfo(const char *identity_digest, int is_authority);
void directory_post_to_hs_dir(smartlist_t *descs, const char *service_id,
int seconds_valid);
int directory_get_from_hs_dir(const char *desc_id, const char *query);
time_t download_status_increment_failure(download_status_t *dls, time_t download_status_increment_failure(download_status_t *dls,
int status_code, const char *item, int status_code, const char *item,
int server, time_t now); int server, time_t now);

View File

@ -336,7 +336,7 @@ directory_clean_last_hid_serv_requests(void)
* in the case that no hidden service directory is left to ask for the * in the case that no hidden service directory is left to ask for the
* descriptor, return 0, and in case of a failure -1. <b>query</b> is only * descriptor, return 0, and in case of a failure -1. <b>query</b> is only
* passed for pretty log statements. */ * passed for pretty log statements. */
int static int
directory_get_from_hs_dir(const char *desc_id, const char *query) directory_get_from_hs_dir(const char *desc_id, const char *query)
{ {
smartlist_t *responsible_dirs = smartlist_create(); smartlist_t *responsible_dirs = smartlist_create();

View File

@ -1034,7 +1034,7 @@ find_intro_circuit(rend_intro_point_t *intro, const char *pk_digest,
* rend_encoded_v2_service_descriptor_t's in <b>descs</b> and upload them; * rend_encoded_v2_service_descriptor_t's in <b>descs</b> and upload them;
* <b>service_id</b> and <b>seconds_valid</b> are only passed for logging * <b>service_id</b> and <b>seconds_valid</b> are only passed for logging
* purposes. */ * purposes. */
void static void
directory_post_to_hs_dir(smartlist_t *descs, const char *service_id, directory_post_to_hs_dir(smartlist_t *descs, const char *service_id,
int seconds_valid) int seconds_valid)
{ {