Author: arma
Date: 2008-01-26 20:03:30 -0500 (Sat, 26 Jan 2008)
New Revision: 13305
Modified:
tor/trunk/src/or/or.h
tor/trunk/src/or/rendclient.c
tor/trunk/src/or/rendservice.c
Log:
Revert r13301 and part of r13304. I guess nick's svk messed up.
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2008-01-26 23:18:30 UTC (rev 13304)
+++ tor/trunk/src/or/or.h 2008-01-27 01:03:30 UTC (rev 13305)
@@ -3030,10 +3030,6 @@
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);
Modified: tor/trunk/src/or/rendclient.c
===================================================================
--- tor/trunk/src/or/rendclient.c 2008-01-26 23:18:30 UTC (rev 13304)
+++ tor/trunk/src/or/rendclient.c 2008-01-27 01:03:30 UTC (rev 13305)
@@ -336,7 +336,7 @@
* 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();
Modified: tor/trunk/src/or/rendservice.c
===================================================================
--- tor/trunk/src/or/rendservice.c 2008-01-26 23:18:30 UTC (rev 13304)
+++ tor/trunk/src/or/rendservice.c 2008-01-27 01:03:30 UTC (rev 13305)
@@ -1034,7 +1034,7 @@
* 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)
{