summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-02-11 18:42:22 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2020-02-11 18:42:22 +0200
commit9892cc3b12db4dc1e8cbffec8e18bb18cbd77d0f (patch)
treec14ea5a2254671cff070fe302e043e2db8a8c7ff /src
parent2a524662c3f8a44acd273fd0e60e161cb9a2ed0f (diff)
parent40a321659a6537131566442ab3c2afd6f58019c9 (diff)
downloadtor-9892cc3b12db4dc1e8cbffec8e18bb18cbd77d0f.tar.gz
tor-9892cc3b12db4dc1e8cbffec8e18bb18cbd77d0f.zip
Merge branch 'tor-github/pr/1707'
Diffstat (limited to 'src')
-rw-r--r--src/feature/hs/hs_client.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index 4599bde5bb..222261e604 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -633,9 +633,14 @@ send_introduce1(origin_circuit_t *intro_circ,
/* We need to find which intro point in the descriptor we are connected to
* on intro_circ. */
ip = find_desc_intro_point_by_ident(intro_circ->hs_ident, desc);
- if (BUG(ip == NULL)) {
- /* If we can find a descriptor from this introduction circuit ident, we
- * must have a valid intro point object. Permanent error. */
+ if (ip == NULL) {
+ /* The following is possible if the descriptor was changed while we had
+ * this introduction circuit open and waiting for the rendezvous circuit to
+ * be ready. Which results in this situation where we can't find the
+ * corresponding intro point within the descriptor of the service. */
+ log_info(LD_REND, "Unable to find introduction point for service %s "
+ "while trying to send an INTRODUCE1 cell.",
+ safe_str_client(onion_address));
goto perm_err;
}