summaryrefslogtreecommitdiff
path: root/src/feature/hs
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-02-04 10:13:10 -0500
committerteor <teor@torproject.org>2020-02-12 14:09:40 +1000
commit88489cd29006f093e1a5572711b26ee1b057e359 (patch)
treed440bd740691bc568436eff4f90aef7d6e16f36b /src/feature/hs
parent41d52e9cd80bfb318ec7f0969f3889d275012e37 (diff)
downloadtor-88489cd29006f093e1a5572711b26ee1b057e359.tar.gz
tor-88489cd29006f093e1a5572711b26ee1b057e359.zip
hs-v3: Remove BUG() that can occur normally
Fixes #28992 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/hs')
-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 fd2d266453..b045e1899b 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -596,9 +596,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;
}