Make hidden services always check for failed intro point connections

Previously, they would stop checking when they exceeded their intro point
creation limit.

Fixes bug 21596; bugfix on commit d67bf8b2f2 in Tor 0.2.7.2-alpha.
Reported by alecmuffett.
This commit is contained in:
teor 2017-03-02 15:33:09 +11:00
parent 75492598b2
commit e0486c9371
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
2 changed files with 10 additions and 5 deletions

5
changes/bug21596 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (hidden services):
- Make hidden services check for failed intro point connections, even when
they have exceeded their intro point creation limit. Fixes bug 21596;
bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha. Reported by
alecmuffett.

View File

@ -3930,6 +3930,10 @@ rend_consider_services_intro_points(void)
smartlist_clear(exclude_nodes);
smartlist_clear(retry_nodes);
/* Cleanup the invalid intro points and save the node objects, if any,
* in the exclude_nodes and retry_nodes lists. */
remove_invalid_intro_points(service, exclude_nodes, retry_nodes, now);
/* This retry period is important here so we don't stress circuit
* creation. */
if (now > service->intro_period_started + INTRO_CIRC_RETRY_PERIOD) {
@ -3939,14 +3943,10 @@ rend_consider_services_intro_points(void)
} else if (service->n_intro_circuits_launched >=
MAX_INTRO_CIRCS_PER_PERIOD) {
/* We have failed too many times in this period; wait for the next
* one before we try again. */
* one before we try to initiate any more connections. */
continue;
}
/* Cleanup the invalid intro points and save the node objects, if apply,
* in the exclude_nodes and retry_nodes list. */
remove_invalid_intro_points(service, exclude_nodes, retry_nodes, now);
/* Let's try to rebuild circuit on the nodes we want to retry on. */
SMARTLIST_FOREACH_BEGIN(retry_nodes, rend_intro_point_t *, intro) {
r = rend_service_launch_establish_intro(service, intro);