diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-01-27 01:03:30 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-01-27 01:03:30 +0000 |
| commit | 6dfd2f531cc086d66611ec101298bf9b82ae4fed (patch) | |
| tree | 04a11ca6ee23da8a1182e8fe8b89d842784912c4 | |
| parent | 68cf666d04aebe8bb905bd79dfd61f82fda8731d (diff) | |
| download | tor-6dfd2f531cc086d66611ec101298bf9b82ae4fed.tar.gz tor-6dfd2f531cc086d66611ec101298bf9b82ae4fed.zip | |
Revert r13301 and part of r13304. I guess nick's svk messed up.
svn:r13305
| -rw-r--r-- | src/or/or.h | 4 | ||||
| -rw-r--r-- | src/or/rendclient.c | 2 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/or/or.h b/src/or/or.h index 477d5e9501..d508a3241a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3030,10 +3030,6 @@ int dir_split_resource_into_fingerprints(const char *resource, char *directory_dump_request_log(void); 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, int status_code, const char *item, int server, time_t now); diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 9e4475821a..c8f6f43f04 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -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 * descriptor, return 0, and in case of a failure -1. <b>query</b> is only * passed for pretty log statements. */ -int +static int directory_get_from_hs_dir(const char *desc_id, const char *query) { smartlist_t *responsible_dirs = smartlist_create(); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 92806e8b05..2894702ee9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -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; * <b>service_id</b> and <b>seconds_valid</b> are only passed for logging * purposes. */ -void +static void directory_post_to_hs_dir(smartlist_t *descs, const char *service_id, int seconds_valid) { |