aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendmid.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2015-04-02 13:38:52 +0100
committerNick Mathewson <nickm@torproject.org>2015-04-03 09:40:47 -0400
commit8656cbcfc0cdce98d57e8f77d56bc8a69f5568b6 (patch)
tree2c98337574b0302c575889817915baf505ebb25b /src/or/rendmid.c
parentc2462621ab0c6d74f5249c19b3c1bfccdb90a2c2 (diff)
downloadtor-8656cbcfc0cdce98d57e8f77d56bc8a69f5568b6.tar.gz
tor-8656cbcfc0cdce98d57e8f77d56bc8a69f5568b6.zip
... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
(Sending a nak would be pointless.) See ticket 15515 for discussion.
Diffstat (limited to 'src/or/rendmid.c')
-rw-r--r--src/or/rendmid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index f85562e042..2451acb514 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -157,7 +157,8 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
"Blocking multiple introductions on the same circuit. "
"Someone might be trying to attack a hidden service through "
"this relay.");
- goto err;
+ circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
+ return -1;
}
circ->already_received_introduce1 = 1;