summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-01-24 05:15:50 +0000
committerRoger Dingledine <arma@torproject.org>2008-01-24 05:15:50 +0000
commit4637a61b3c079c067af561e6b63498ff2c68fbd9 (patch)
treeb0cff19003ab1b1e2135d3c928d08499ed5ed6c7
parentc973eb5e2326fb64cdddb1b0badc355c459f8fee (diff)
downloadtor-4637a61b3c079c067af561e6b63498ff2c68fbd9.tar.gz
tor-4637a61b3c079c067af561e6b63498ff2c68fbd9.zip
more cleanup on r13250: no need to log in both places
svn:r13253
-rw-r--r--src/or/rendclient.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 2dfc50580f..48b6498133 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -323,23 +323,8 @@ rend_client_refetch_v2_renddesc(const char *query)
"descriptor ID did not succeed.");
return;
}
- switch (directory_get_from_hs_dir(descriptor_id, query)) {
- case -1:
- /* Whatever error this was, it was already logged. */
- log_info(LD_REND, "Error while trying to fetch descriptor from "
- "hidden service directory!");
- return;
- case 0:
- /* Try the next replica, if available. */
- log_info(LD_REND, "No hidden service directory left for this replica; "
- "trying another.");
- continue;
- case 1:
- /* Request was sent, we are done here. */
- log_info(LD_REND, "Request to fetch descriptor from hidden service "
- "directory sent; waiting for response.");
- return;
- }
+ if (directory_get_from_hs_dir(descriptor_id, query) != 0)
+ return; /* either success or failure, but we're done */
}
/* If we come here, there are no hidden service directories left. */
log_info(LD_REND, "Could not pick one of the responsible hidden "