diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 9 | ||||
| -rw-r--r-- | src/or/directory.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 2 | ||||
| -rw-r--r-- | src/or/rendclient.c | 23 |
4 files changed, 27 insertions, 11 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 41d7020bd..6aa5f8588 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -523,8 +523,13 @@ connection_about_to_close_connection(connection_t *conn) * failed: forget about this router, and maybe try again. */ connection_dir_request_failed(dir_conn); } - if (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC) - rend_client_desc_here(dir_conn->rend_query); /* give it a try */ + if (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC) { + /* Give it a try. However, there is no re-fetching for v0 rend + * descriptors; if the response is empty or the descriptor is + * unusable, close pending connections (unless a v2 request is + * still in progress). */ + rend_client_desc_here(dir_conn->rend_query, 0); + } /* If we were trying to fetch a v2 rend desc and did not succeed, * retry as needed. (If a fetch is successful, the connection state * is changed to DIR_PURPOSE_HAS_FETCHED_RENDDESC to mark that diff --git a/src/or/directory.c b/src/or/directory.c index 246592f89..c75fe2da0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1892,7 +1892,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } else { /* success. notify pending connections about this. */ conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC; - rend_client_desc_here(conn->rend_query); + rend_client_desc_here(conn->rend_query, -1); } break; case 404: @@ -1938,7 +1938,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) log_info(LD_REND, "Successfully fetched v2 rendezvous " "descriptor."); conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC; - rend_client_desc_here(conn->rend_query); + rend_client_desc_here(conn->rend_query, -1); break; } break; diff --git a/src/or/or.h b/src/or/or.h index 09abeb50e..e2a0d871b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3842,7 +3842,7 @@ int rend_client_rendezvous_acked(origin_circuit_t *circ, const char *request, size_t request_len); int rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request, size_t request_len); -void rend_client_desc_here(const char *query); +void rend_client_desc_here(const char *query, int rend_version); extend_info_t *rend_client_get_random_intro(const char *query); diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 155b51c1c..46a49bed9 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -462,6 +462,8 @@ rend_client_refetch_v2_renddesc(const char *query) log_info(LD_REND, "Could not pick one of the responsible hidden " "service directories to fetch descriptors, because " "we already tried them all unsuccessfully."); + /* Close pending connections (unless a v0 request is still going on). */ + rend_client_desc_here(query, 2); return; } @@ -625,11 +627,14 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request, /** Find all the apconns in state AP_CONN_STATE_RENDDESC_WAIT that * are waiting on query. If there's a working cache entry here - * with at least one intro point, move them to the next state; - * else fail them. + * with at least one intro point, move them to the next state. If + * <b>rend_version</b> is non-negative, fail connections that have + * requested <b>query</b> unless there are still descriptor fetch + * requests in progress for other descriptor versions than + * <b>rend_version</b>. */ void -rend_client_desc_here(const char *query) +rend_client_desc_here(const char *query, int rend_version) { edge_connection_t *conn; rend_cache_entry_t *entry; @@ -666,9 +671,15 @@ rend_client_desc_here(const char *query) connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); } } else { /* 404, or fetch didn't get that far */ - log_notice(LD_REND,"Closing stream for '%s.onion': hidden service is " - "unavailable (try again later).", safe_str(query)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_RESOLVEFAILED); + /* Unless there are requests for another descriptor version pending, + * close the connection. */ + if (rend_version >= 0 && + !connection_get_by_type_state_rendquery(CONN_TYPE_DIR, 0, query, + rend_version == 0 ? 2 : 0)) { + log_notice(LD_REND,"Closing stream for '%s.onion': hidden service is " + "unavailable (try again later).", safe_str(query)); + connection_mark_unattached_ap(conn, END_STREAM_REASON_RESOLVEFAILED); + } } }); } |