diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2009-06-19 16:26:02 +0200 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2009-06-19 16:26:02 +0200 |
| commit | f266ecbeec83397acf2dce46feebd6389d896d14 (patch) | |
| tree | 7e16e2f267d53c4bc3ba560c1766ab7ad807287f /src | |
| parent | 20883f5e8343039eca08b5e2e66e0d213143e65d (diff) | |
| download | tor-f266ecbeec83397acf2dce46feebd6389d896d14.tar.gz tor-f266ecbeec83397acf2dce46feebd6389d896d14.zip | |
Better fix for 997.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection_edge.c | 3 | ||||
| -rw-r--r-- | src/or/or.h | 4 | ||||
| -rw-r--r-- | src/or/rendclient.c | 9 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9b1f737917..1ef87dbffa 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1683,9 +1683,6 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, if (conn->rend_data->auth_type == REND_NO_AUTH) rend_client_refetch_renddesc(conn->rend_data->onion_address); } else { /* r > 0 */ -/** How long after we receive a hidden service descriptor do we consider - * it valid? */ -#define NUM_SECONDS_BEFORE_HS_REFETCH (60*15) if (now - entry->received < NUM_SECONDS_BEFORE_HS_REFETCH) { conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT; log_info(LD_REND, "Descriptor is here and fresh enough. Great."); diff --git a/src/or/or.h b/src/or/or.h index 330b2ecbe7..f84485f2f4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -636,6 +636,10 @@ typedef enum { /** Length of a binary-encoded rendezvous service ID. */ #define REND_SERVICE_ID_LEN 10 +/** How long after we receive a hidden service descriptor do we consider + * it fresh? */ +#define NUM_SECONDS_BEFORE_HS_REFETCH (60*15) + /** Time period for which a v2 descriptor will be valid. */ #define REND_TIME_PERIOD_V2_DESC_VALIDITY (24*60*60) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 784db9dadf..5b18a519b0 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -482,8 +482,9 @@ rend_client_refetch_v2_renddesc(const rend_data_t *rend_query) { char descriptor_id[DIGEST_LEN]; int replicas_left_to_try[REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS]; - int i, tries_left; + int i, tries_left, r; rend_cache_entry_t *e = NULL; + time_t now = time(NULL); tor_assert(rend_query); /* Are we configured to fetch descriptors? */ if (!get_options()->FetchHidServDescriptors) { @@ -492,9 +493,11 @@ rend_client_refetch_v2_renddesc(const rend_data_t *rend_query) return; } /* Before fetching, check if we already have the descriptor here. */ - if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e) > 0) { + r = rend_cache_lookup_entry(rend_query->onion_address, -1, &e); + if (r > 0 && now - e->received < NUM_SECONDS_BEFORE_HS_REFETCH) { log_info(LD_REND, "We would fetch a v2 rendezvous descriptor, but we " - "already have that descriptor here. Not fetching."); + "already have a fresh copy of that descriptor here. " + "Not fetching."); return; } log_debug(LD_REND, "Fetching v2 rendezvous descriptor for service %s", |