aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug40400_part25
-rw-r--r--src/feature/rend/rendmid.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/changes/bug40400_part2 b/changes/bug40400_part2
new file mode 100644
index 0000000000..9b834d5ea1
--- /dev/null
+++ b/changes/bug40400_part2
@@ -0,0 +1,5 @@
+ o Minor bugfixes (usability):
+ - Do not log "RENDEZVOUS1 cell with unrecognized rendezvous cookie"
+ at LOG_PROTOCOL_WARN; instead log it at DEBUG. This warning can happen
+ naturally if a client gives up on a rendezvous circuit after sending
+ INTRODUCE1. Fixes part of bug 40400; bugfix on 0.1.1.13-alpha.
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index df838aa527..8f6a45dfef 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -131,7 +131,11 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
rend_circ = hs_circuitmap_get_rend_circ_relay_side(request);
if (!rend_circ) {
- log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+ /* Once this was a LOG_PROTOCOL_WARN, but it can happen naturally if a
+ * client gives up on a rendezvous circuit after sending INTRODUCE1, but
+ * before the onion service sends the RENDEZVOUS1 cell.
+ */
+ log_fn(LOG_DEBUG, LD_PROTOCOL,
"Rejecting RENDEZVOUS1 cell with unrecognized rendezvous cookie %s.",
hexid);
reason = END_CIRC_REASON_TORPROTOCOL;