From c7f1b46a104b18bed017d509a8860e60f7154d67 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 15 Jun 2016 09:54:59 -0400 Subject: Perform cache lookup when FetchHidServDescriptors is set The FetchHidServDescriptors check was placed before the descriptor cache lookup which made the option not working because it was never using the cache in the first place. Fixes #18704 Patched-by: twim Signef-off-by: David Goulet --- src/or/rendclient.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/or/rendclient.c') diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 7e92dce6d4..64d367354b 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -895,12 +895,6 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) rend_cache_entry_t *e = NULL; tor_assert(rend_query); - /* Are we configured to fetch descriptors? */ - if (!get_options()->FetchHidServDescriptors) { - log_warn(LD_REND, "We received an onion address for a v2 rendezvous " - "service descriptor, but are not fetching service descriptors."); - return; - } /* Before fetching, check if we already have a usable descriptor here. */ if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e) == 0 && rend_client_any_intro_points_usable(e)) { @@ -908,6 +902,12 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) "already have a usable descriptor here. Not fetching."); return; } + /* Are we configured to fetch descriptors? */ + if (!get_options()->FetchHidServDescriptors) { + log_warn(LD_REND, "We received an onion address for a v2 rendezvous " + "service descriptor, but are not fetching service descriptors."); + return; + } log_debug(LD_REND, "Fetching v2 rendezvous descriptor for service %s", safe_str_client(rend_query->onion_address)); -- cgit v1.2.3-54-g00ecf