mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug14224_025_v1'

Browse source
This commit is contained in:
Nick Mathewson 2015-01-20 14:02:07 -05:00
commit 9ddc1fb10c
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug14224 Normal file
View file

@ -0,0 +1,4 @@
o Minor Bugfix
- Close the intro circuit once we don't have any more usable intro
points instead of making it timeout at some point. This also make sure
no extra HS descriptor fetch is triggered.

7
src/or/rendclient.c
View file

@ -451,6 +451,13 @@ rend_client_introduction_acked(origin_circuit_t *circ,
/* XXXX If that call failed, should we close the rend circuit,
* too? */
return result;
} else {
/* Close circuit because no more intro points are usable thus not
* useful anymore. Change it's purpose before so we don't report an
* intro point failure again triggering an extra descriptor fetch. */
circuit_change_purpose(TO_CIRCUIT(circ),
CIRCUIT_PURPOSE_C_INTRODUCE_ACKED);
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED);
}
}
return 0;