diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2012-04-17 05:40:36 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-20 17:23:31 -0400 |
| commit | 627c37ad6a06e3aa68e7af54cca177720a0d8267 (patch) | |
| tree | aaeffa2cfbdcc896f72452b6cb3bae6a339c01af | |
| parent | 5630b61f5c902704f4a4438c321503da2981cdac (diff) | |
| download | tor-627c37ad6a06e3aa68e7af54cca177720a0d8267.tar.gz tor-627c37ad6a06e3aa68e7af54cca177720a0d8267.zip | |
Don't reset intro-point creation rate-limiting timer
Previously, we would reset it at the drop of a hat -- every time a second
passes without any of the intro-point circs already launched for the
service failing.
Fixes bug 4607.
| -rw-r--r-- | changes/bug4607 | 9 | ||||
| -rw-r--r-- | src/or/rendservice.c | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/changes/bug4607 b/changes/bug4607 new file mode 100644 index 0000000000..dd064cc4b3 --- /dev/null +++ b/changes/bug4607 @@ -0,0 +1,9 @@ + o Minor bugfixes: + + - Don't launch more than 10 (service-side) introduction-point + circuits for a hidden service in five minutes. Previously, we + would consider launching more introduction-point circuits if at + least one second had passed without any introduction-point + circuits failing. Fixes bug 4607; bugfix on 0.0.7rc1. + + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 44e6697018..f2fc6a7837 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2270,14 +2270,6 @@ rend_services_introduce(void) if (!intro_point_set_changed && (n_intro_points_unexpired >= service->n_intro_points_wanted)) { - /* We have enough intro circuits in progress, and none of our - * intro circuits have died since the last call to - * rend_services_introduce! Start a fresh period and reset the - * circuit count. - * - * XXXX WTF? */ - service->intro_period_started = now; - service->n_intro_circuits_launched = 0; continue; } |