From 4637a61b3c079c067af561e6b63498ff2c68fbd9 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 24 Jan 2008 05:15:50 +0000 Subject: [PATCH] more cleanup on r13250: no need to log in both places svn:r13253 --- src/or/rendclient.c | 19 ++----------------- 1 file 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 "