summaryrefslogtreecommitdiff
path: root/src/or/hs_common.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-12-04 11:49:48 -0500
committerDavid Goulet <dgoulet@torproject.org>2017-12-05 10:55:41 -0500
commite80893e51b0c0320838cbed8c46fd5b0fe608bef (patch)
tree86baba40b85f098f6e5954dc7aa303a84d95e806 /src/or/hs_common.c
parentba63c4099a491c3f96160005f94cf3a61433c145 (diff)
downloadtor-e80893e51b0c0320838cbed8c46fd5b0fe608bef.tar.gz
tor-e80893e51b0c0320838cbed8c46fd5b0fe608bef.zip
hs-v3: Cleanup HS circuits when marking as closed
First, hs_service_intro_circ_has_closed() is now called in circuit_mark_for close() because the HS subsystem needs to learn when an intro point is actually not established anymore as soon as possible. There is a time window between a close and a free. Second, when we mark for close, we also remove it from the circuitmap because between the close and the free, a service can launch an new circuit to that same intro point and thus register it which only succeeds if the intro point authentication key is not already in the map. However, we still do a remove from the circuitmap in circuit_free() in order to also cleanup the circuit if it wasn't marked for close prior to the free. Fixes #23603 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/hs_common.c')
-rw-r--r--src/or/hs_common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index a0f2af29cd..ad783a36fb 100644
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -22,6 +22,7 @@
#include "hs_client.h"
#include "hs_ident.h"
#include "hs_service.h"
+#include "hs_circuitmap.h"
#include "policies.h"
#include "rendcommon.h"
#include "rendservice.h"