diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-08-31 11:40:22 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2017-08-31 11:40:22 -0400 |
| commit | a52a32c855b2ed59cb915ad687d80f1294c6f0a3 (patch) | |
| tree | 1fc2ddc33e226da3a681c1370c602dd7127a0ad5 /src/or/hs_service.c | |
| parent | 209bfe715cc8c1c59b2578c406749a0d4a5bd8cb (diff) | |
| download | tor-a52a32c855b2ed59cb915ad687d80f1294c6f0a3.tar.gz tor-a52a32c855b2ed59cb915ad687d80f1294c6f0a3.zip | |
hs: Set rendezvous circuit timestamp_dirty all the time
We used to check if it was set to 0 which is what unused circuit have but when
the rendezvous circuit was cannibalized, the timestamp_dirty is not 0 but we
still need to reset it so we can actually use it without having the chance of
expiring the next second (or very soon).
Fixes #23123
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/hs_service.c')
| -rw-r--r-- | src/or/hs_service.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 5ff118222d..d004bae239 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -2590,9 +2590,10 @@ service_rendezvous_circ_has_opened(origin_circuit_t *circ) tor_assert(circ->hs_ident); tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND); - /* Declare the circuit dirty to avoid reuse, and for path-bias */ - if (!TO_CIRCUIT(circ)->timestamp_dirty) - TO_CIRCUIT(circ)->timestamp_dirty = time(NULL); + /* Declare the circuit dirty to avoid reuse, and for path-bias. We set the + * timestamp regardless of its content because that circuit could have been + * cannibalized so in any cases, we are about to use that circuit more. */ + TO_CIRCUIT(circ)->timestamp_dirty = time(NULL); pathbias_count_use_attempt(circ); /* Get the corresponding service and intro point. */ |